From d39680e9f54322ddcb40b00503a8ee30aee6c99c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 28 Jun 2011 20:12:51 -0400
Subject: [PATCH] Changes for minor 0.5.1 release.
---
distrib/gitblit.properties | 73 +++++++++++++++++++-----------------
1 files changed, 38 insertions(+), 35 deletions(-)
diff --git a/distrib/gitblit.properties b/distrib/gitblit.properties
index c17674a..81ce0eb 100644
--- a/distrib/gitblit.properties
+++ b/distrib/gitblit.properties
@@ -2,24 +2,21 @@
# Git Servlet Settings
#
-# Allow push/pull over http/https with JGit servlet
-# Changing this value requires a server restart.
-git.enableGitServlet = true
-
# Base folder for repositories
# Changing this value requires a server restart.
# Use forward slashes even on Windows!!
# e.g. c:/gitrepos
git.repositoriesFolder = git
-# Export all repositories
-# Changing this value requires a server restart.
-# if false, each exported repository must have a .git/git-daemon-export-ok file
-git.exportAll = true
-
-# Search repositories folder for nested repositories
+# Search the repositories folder subfolders for other repositories.
+# Repositories MAY NOT be nested (i.e. one repository within another)
+# but they may be grouped together in subfolders.
# e.g. c:/gitrepos/libraries/mylibrary.git
-git.nestedRepositories = true
+# c:/gitrepos/libraries/myotherlibrary.git
+git.searchRepositoriesSubfolders = true
+
+# Allow push/pull over http/https with JGit servlet.
+git.enableGitServlet = true
#
# Authentication Settings
@@ -33,9 +30,15 @@
# Changing this value requires a server restart.
web.authenticateAdminPages = true
-# Simple user realm file to authenticate users
+# Allow Gitblit to store a cookie in the user's browser for automatic
+# authentication. The cookie is generated by the user service.
+web.allowCookieAuthentication = true
+
+# Either the path to a simple user properties file
+# OR a fully qualified class name that implements the IUserService interface.
+# Any custom implementation must have a public default constructor.
# Changing this value requires a server restart.
-realm.realmFile = users.properties
+realm.userService = users.properties
# How to store passwords.
# Valid values are plain or md5. Default is md5.
@@ -58,8 +61,11 @@
# functions.
web.allowAdministration = true
-# Allow dyanamic zip downloads.
+# Allow dynamic zip downloads.
web.allowZipDownloads = true
+
+# Default number of entries to include in RSS Syndication links
+web.syndicationEntries = 25
# This is the message display above the repositories table.
# This can point to a file with Markdown content.
@@ -67,7 +73,9 @@
web.repositoriesMessage = gitblit
# Use the client timezone when formatting dates.
-# This uses AJAX to determine the browser's timezone.
+# This uses AJAX to determine the browser's timezone and may require more
+# server overhead because a Wicket session is created. All Gitblit pages
+# attempt to be stateless, if possible.
# Changing this value requires a server restart.
web.useClientTimezone = false
@@ -75,6 +83,12 @@
# http://download.oracle.com/javase/6/docs/api/java/text/SimpleDateFormat.html
web.datestampShortFormat = yyyy-MM-dd
web.datetimestampLongFormat = EEEE, MMMM d, yyyy h:mm a z
+
+# Mount parameters
+# true: http://localhost/commit/myrepo/abcdef
+# false: http://localhost/commit/?r=myrepo&h=abcdef
+# Changing this value requires a server restart.
+web.mountParameters = true
# Show other URLs on the summary page for accessing your git repositories
# Use spaces to separate urls. {0} is the token for the repository name.
@@ -110,8 +124,10 @@
# Value must exceed 0 else default of 20 is used
web.summaryCommitCount = 16
-# The number of tags/heads to display on the summary page
-# Value must exceed 0 else default of 5 is used
+# The number of tags/branches to display on the summary page.
+# -1 = all tags/branches
+# 0 = hide tags/branches
+# N = N tags/branches
web.summaryRefsCount = 5
# The number of items to show on a page before showing the first, prev, next
@@ -136,7 +152,7 @@
# Aggressive heap management will run the garbage collector on every generated
# page. This slows down page generation a little but improves heap consumption.
-web.aggressiveHeapManagement = true
+web.aggressiveHeapManagement = false
# Run the webapp in debug mode
# Changing this value requires a server restart.
@@ -148,11 +164,11 @@
# Example global regex substitutions
# Use !!! to separate the search pattern and the replace pattern
# searchpattern!!!replacepattern
-#regex.global.bug = \\b(Bug:)(\\s*[#]?|-){0,1}(\\d+)\\b!!!<a href="http://somehost/bug/$3">Bug-Id: $3</a>
-#regex.global.changeid = \\b(Change-Id:\\s*)([A-Za-z0-9]*)\\b!!!<a href="http://somehost/changeid/$2">Change-Id: $2</a>
+regex.global.bug = \\b(Bug:)(\\s*[#]?|-){0,1}(\\d+)\\b!!!<a href="http://somehost/bug/$3">Bug-Id: $3</a>
+regex.global.changeid = \\b(Change-Id:\\s*)([A-Za-z0-9]*)\\b!!!<a href="http://somehost/changeid/$2">Change-Id: $2</a>
# Example per-repository regex substitutions overrides global
-#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!!!<a href="http://elsewhere/bug/$3">Bug-Id: $3</a>
#
# Server Settings
@@ -162,21 +178,8 @@
# The temporary folder to decompress the gitblit webapp.
server.tempFolder = temp
-# The common log4j logging pattern
-# http://logging.apache.org/log4j/1.2/apidocs/org/apache/log4j/PatternLayout.html
-server.log4jPattern = %-5p %d{MM-dd HH:mm:ss.SSS} %-20.20c{1} %m%n
-
-# Alternatively, you may specify a logging pattern for your OS.
-# If the os pattern is blank, the common pattern is used.
-
-# This windows pattern fits (mostly) within the fixed bounds of a command prompt.
-server.log4jPattern.windows = %-5p %m%n
-
-server.log4jPattern.linux =
-
-
#
-# Jetty Settings
+# Jetty Http/Https Server Settings
#
# Use Jetty NIO connectors. If false, Jetty Socket connectors will be used.
--
Gitblit v1.9.1