From 17725677285470ca7dbf5da93e4235415545a7cf Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 26 Jun 2013 17:09:01 -0400
Subject: [PATCH] Support custom header logo images of 120x45 (issue 208)

---
 src/main/distrib/data/gitblit.properties |   51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 50 insertions(+), 1 deletions(-)

diff --git a/src/main/distrib/data/gitblit.properties b/src/main/distrib/data/gitblit.properties
index 7936bc2..50b09f3 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,13 @@
 #
 # 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
 
 # If *web.authenticateAdminPages*=true, users with "admin" role can create
 # repositories, create users, and edit repository metadata.
@@ -824,7 +832,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.
@@ -1117,12 +1139,39 @@
 # 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.

--
Gitblit v1.9.1