From fbe265fa787e4be9cb63c6bae2ef30b9400d9afc Mon Sep 17 00:00:00 2001
From: Simon Harrer <simon.harrer@gmail.com>
Date: Thu, 18 Jul 2013 10:11:04 -0400
Subject: [PATCH] Fixes findbugs warning - dereferencing null in exception case

---
 src/main/distrib/data/gitblit.properties |  103 ++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 96 insertions(+), 7 deletions(-)

diff --git a/src/main/distrib/data/gitblit.properties b/src/main/distrib/data/gitblit.properties
index 412bcae..f6ed383 100644
--- a/src/main/distrib/data/gitblit.properties
+++ b/src/main/distrib/data/gitblit.properties
@@ -500,6 +500,7 @@
 #    com.gitblit.LdapUserService
 #    com.gitblit.RedmineUserService
 #    com.gitblit.SalesforceUserService
+#    com.gitblit.WindowsUserService
 #
 # Any custom user service implementation must have a public default constructor.
 #
@@ -529,6 +530,53 @@
 #
 # SINCE 0.5.0
 web.siteName =
+
+# You may specify a different logo image for the header but it must be 120x45px.
+# If the specified file does not exist, the default Gitblit logo will be used.
+#
+# SINCE 1.3.0
+# BASEFOLDER
+web.headerLogo = ${baseFolder}/logo.png
+
+# You may specify a custom header background CSS color.  If unspecified, the
+# default color will be used.
+#
+# e.g. web.headerBackgroundColor = #002060
+#
+# SINCE 1.3.0
+web.headerBackgroundColor =
+
+# You may specify a custom header foreground CSS color.  If unspecified, the
+# default color will be used.
+#
+# e.g. web.headerForegroundColor = white
+#
+# SINCE 1.3.0
+web.headerForegroundColor =
+
+# You may specify a custom header foreground hover CSS color.  If unspecified, the
+# default color will be used.
+#
+# e.g. web.headerHoverColor = white
+#
+# SINCE 1.3.0
+web.headerHoverColor =
+
+# You may specify a custom header border CSS color.  If unspecified, the default
+# color will be used.
+#
+# e.g. web.headerBorderColor = #002060
+#
+# SINCE 1.3.0
+web.headerBorderColor =
+
+# You may specify a custom header border CSS color.  If unspecified, the default
+# color will be used.
+#
+# e.g. web.headerBorderFocusColor = #ff9900
+#
+# SINCE 1.3.0
+web.headerBorderFocusColor =
 
 # If *web.authenticateAdminPages*=true, users with "admin" role can create
 # repositories, create users, and edit repository metadata.
@@ -824,7 +872,21 @@
 #
 # SPACE-DELIMITED
 # SINCE 1.3.0
-web.activityDurationChoices = 7 14 28 60 90 180
+web.activityDurationChoices = 1 3 7 14 21 28
+
+# The number of days of commits to cache in memory for the dashboard, activity,
+# and project pages.  A value of 0 will disable all caching and will parse commits
+# in each repository per-request.  If the value > 0 these pages will try to fulfill
+# requests using the commit cache.  If the request specifies a period which falls
+# outside the commit cache window, then the cache will be ignored and the request
+# will be fulfilled by brute-force parsing all relevant commits per-repository.
+#
+# Consider the values specified for *web.activityDurationChoices* when setting
+# the cache size AND consider adjusting the JVM -Xmx heap parameter appropriately.
+#
+# SINCE 1.3.0
+# RESTART REQUIRED
+web.activityCacheDays = 14
 
 # Case-insensitive list of authors to exclude from metrics.  Useful for
 # eliminating bots.
@@ -853,17 +915,17 @@
 # SINCE 0.5.0
 web.itemsPerPage = 50
 
-# The number of pushes to display on the overview page
+# The number of reflog changes to display on the overview page
 # Value must exceed 0 else default of 5 is used
 #
 # SINCE 1.3.0
-web.overviewPushCount = 5
+web.overviewReflogCount = 5
 
-# The number of pushes to show on a push page before show the first, prev, next
-# pagination links.  A default of 10 is used for any invalid value.
+# The number of reflog changes to show on a reflog page before show the first,
+#  prev, next pagination links.  A default of 10 is used for any invalid value.
 #
 # SINCE 1.3.0
-web.pushesPerPage = 10
+web.reflogChangesPerPage = 10
 
 # Registered file extensions to ignore during Lucene indexing
 #
@@ -1117,18 +1179,45 @@
 # SINCE 1.3.0
 realm.container.autoCreateAccounts = false
 
+# The WindowsUserService must be backed by another user service for standard user
+# and team management.
+# default: users.conf
+#
+# RESTART REQUIRED
+# BASEFOLDER
+# SINCE 1.3.0
+realm.windows.backingUserService = ${baseFolder}/users.conf
+
+# Allow or prohibit Windows guest account logins
+#
+# SINCE 1.3.0
+realm.windows.allowGuests = false
+
+# The default domain for authentication.
+#
+# If specified, this domain will be used for authentication UNLESS the supplied
+# login name manually specifies a domain (.e.g. mydomain\james or james@mydomain)
+#
+# If unspecified, the username must be specified in UPN format (name@domain).
+#
+# if "." (dot) is specified, ONLY the local account database will be used.
+#
+# SINCE 1.3.0
+realm.windows.defaultDomain =
+
 # The SalesforceUserService must be backed by another user service for standard user
 # and team management.
 # default: users.conf
 #
 # RESTART REQUIRED
 # BASEFOLDER
+# SINCE 1.3.0
 realm.salesforce.backingUserService = ${baseFolder}/users.conf
 
 # Restrict the Salesforce user to members of this org.
 # default: 0 (i.e. do not check the Org ID)
 #
-# RESTART REQUIRED
+# SINCE 1.3.0
 realm.salesforce.orgId = 0
 
 # URL of the LDAP server.

--
Gitblit v1.9.1