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 | 56 +++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 43 insertions(+), 13 deletions(-)
diff --git a/src/main/distrib/data/gitblit.properties b/src/main/distrib/data/gitblit.properties
index 0837cde..ab7b999 100644
--- a/src/main/distrib/data/gitblit.properties
+++ b/src/main/distrib/data/gitblit.properties
@@ -164,15 +164,21 @@
git.defaultAuthorizationControl = NAMED
# The prefix for a users personal repository directory.
+#
# Personal user repositories are created in this directory, named by the user name
-# prefixed with the userRepositoeryPrefix. For eaxmple, a user 'john' would have his
+# prefixed with the userRepositoryPrefix. For eaxmple, a user 'john' would have his
# personal repositories in the directory '~john'.
+#
# Cannot be an empty string. Also, absolute paths are changed to relative paths by
# removing the first directory separator.
#
+# It is not recommended to change this value AFTER your user's have created
+# personal repositories because it will break all permissions, ownership, and
+# repository push/pull operations.
+#
# RESTART REQUIRED
-# SINCE 1.3.2
-git.userRepositoryPrefix = "~"
+# SINCE 1.4.0
+git.userRepositoryPrefix = ~
# The default incremental push tag prefix. Tag prefix applied to a repository
# that has automatic push tags enabled and does not specify a custom tag prefix.
@@ -184,6 +190,18 @@
#
# SINCE 1.3.0
git.defaultIncrementalPushTagPrefix = r
+
+# Controls creating a repository as --shared on Unix servers.
+#
+# In an Unix environment where mixed access methods exist for shared repositories,
+# the repository should be created with 'git init --shared' to make sure that
+# it can be accessed e.g. via ssh (user git) and http (user www-data).
+#
+# Valid values are the values available for the '--shared' option. The the manual
+# page for 'git init' for more information on shared repositories.
+#
+# SINCE 1.4.0
+git.createRepositoriesShared = false
# Enable JGit-based garbage collection. (!!EXPERIMENTAL!!)
#
@@ -860,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
#
@@ -876,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
@@ -956,7 +982,7 @@
#
# SPACE-DELIMITED
# SINCE 0.9.0
-web.luceneIgnoreExtensions = 7z arc arj bin bmp dll doc docx exe gif gz jar jpg lib lzh odg odf odt pdf ppt png so swf xcf xls xlsx zip
+web.luceneIgnoreExtensions = 7z arc arj bin bmp dll doc docx exe gif gz jar jpg lib lzh odg odf odt pdf ppt pptx png so swf tar xcf xls xlsx zip
# Registered extensions for google-code-prettify
#
@@ -981,7 +1007,7 @@
#
# SPACE-DELIMITED
# SINCE 0.5.0
-web.binaryExtensions = jar pdf tar.gz zip
+web.binaryExtensions = 7z arc arj bin dll doc docx exe gz jar lib lzh odg odf odt pdf ppt pptx so tar xls xlsx zip
# Aggressive heap management will run the garbage collector on every generated
# page. This slows down page generation a little but improves heap consumption.
@@ -1014,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