From a047669265c4090d7d0982f5654d4974a58ac12a Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 19 Sep 2013 08:36:25 -0400
Subject: [PATCH] Disable *most* activity graphs when web.generateActivityGraph=false

---
 src/main/distrib/data/gitblit.properties |   28 ++++++++++++++++++++--------
 1 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/main/distrib/data/gitblit.properties b/src/main/distrib/data/gitblit.properties
index 1fe1561..ab7b999 100644
--- a/src/main/distrib/data/gitblit.properties
+++ b/src/main/distrib/data/gitblit.properties
@@ -878,10 +878,13 @@
 # SINCE 0.8.0
 web.repositoryListSwatches = true
 
-# Choose the diff presentation style: gitblt, gitweb, or plain
+# Defines the default commit message renderer.  This can be configured
+# per-repository.
 #
-# SINCE 0.5.0
-web.diffStyle = gitblit
+# Valid values are: plain, markdown
+#
+# SINCE 1.4.0
+web.commitMessageRenderer = plain
 
 # Control if email addresses are shown in web ui
 #
@@ -894,11 +897,16 @@
 # SINCE 0.5.0
 web.showSearchTypeSelection = false
 
-# Generates a line graph of repository activity over time on the Summary page.
-# This uses the Google Charts API.
+# Controls display of activity graphs on the dashboard, activity, and summary
+# pages.  Charting makes use of the external Google Charts API.
 #
 # SINCE 0.5.0 
 web.generateActivityGraph = true
+
+# Displays the commits branch graph in the summary page and commits/log page.
+#
+# SINCE 1.4.0
+web.showBranchGraph = true
 
 # The default number of days to show on the activity page.
 # Value must exceed 0 else default of 7 is used
@@ -1032,13 +1040,17 @@
 # Use !!! to separate the search pattern and the replace pattern
 # searchpattern!!!replacepattern
 # SINCE 0.5.0
-regex.global.bug = \\b(Bug:)(\\s*[#]?|-){0,1}(\\d+)\\b!!!<a href="http://somehost/bug/$3">Bug-Id: $3</a>
+
+# regex.global.bug = \\b(Bug:)(\\s*[#]?|-){0,1}(\\d+)\\b!!!Bug: <a href="http://somehost/bug/$3">$3</a>
 # SINCE 0.5.0
-regex.global.changeid = \\b(Change-Id:\\s*)([A-Za-z0-9]*)\\b!!!<a href="http://somehost/changeid/$2">Change-Id: $2</a>
+
+# Example Gerrit links
+# regex.global.changeid = \\b(Change-Id:\\s*)([A-Za-z0-9]*)\\b!!!Change-Id: <a href="http://somehost/r/#q,$2,n,z">$2</a>
+# regex.global.reviewedon = \\b(Reviewed-on:\\s*)([A-Za-z0-9:/\\.]*)\\b!!!Reviewed-on: <a href="$2">$2</a>
 
 # Example per-repository regex substitutions overrides global
 # SINCE 0.5.0
-regex.myrepository.bug = \\b(Bug:)(\\s*[#]?|-){0,1}(\\d+)\\b!!!<a href="http://elsewhere/bug/$3">Bug-Id: $3</a>
+# regex.myrepository.bug = \\b(Bug:)(\\s*[#]?|-){0,1}(\\d+)\\b!!!Bug: <a href="http://elsewhere/bug/$3">$3</a>
 
 #
 # Mail Settings

--
Gitblit v1.9.1