From f892c756cf5f973031bcb47a54f3a30d75883478 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 04 Sep 2014 12:01:32 -0400
Subject: [PATCH] Merged #144 "Pretty print perl modules"

---
 src/main/distrib/data/gitblit.properties |   49 ++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/src/main/distrib/data/gitblit.properties b/src/main/distrib/data/gitblit.properties
index 3215094..483ed6d 100644
--- a/src/main/distrib/data/gitblit.properties
+++ b/src/main/distrib/data/gitblit.properties
@@ -271,6 +271,11 @@
 # SINCE 1.4.0
 git.createRepositoriesShared = false
 
+# Directory for gitignore templates used during repository creation.
+#
+# SINCE 1.6.0
+git.gitignoreFolder = ${baseFolder}/gitignore
+
 # Enable JGit-based garbage collection. (!!EXPERIMENTAL!!)
 #
 # USE AT YOUR OWN RISK!
@@ -613,6 +618,12 @@
 # SINCE 1.5.0
 plugins.registry = http://plugins.gitblit.com/plugins.json
 
+# Number of threads used to handle miscellaneous tasks in the background.
+#
+# SINCE 1.6.0
+# RESTART REQUIRED
+execution.defaultThreadPoolSize = 1
+
 #
 # Groovy Integration
 #
@@ -766,6 +777,16 @@
 # SINCE 0.5.0
 web.allowCookieAuthentication = true
 
+# Allow deletion of non-empty repositories. This is enforced for all delete vectors.
+#
+# SINCE 1.6.0
+web.allowDeletingNonEmptyRepositories = true
+
+# Setting to include personal repositories in the main repositories list.
+#
+# SINCE 1.6.0
+web.includePersonalRepositories = false
+
 # Config file for storing project metadata
 #
 # SINCE 1.2.0
@@ -823,8 +844,18 @@
 # SINCE 0.5.0
 web.siteName =
 
-# The canonical url of your Gitblit server to bs used in email notifications.
-# e.g. web.canonicalUrl = https://demo-gitblit.rhcloud.com
+# The canonical url of your Gitblit server to be used in repository url generation,
+# RSS feeds, and all embedded links in email and plugin-based notifications.
+#
+# If you are running Gitblit on a non-standard http port (i.e. not 80 and not 443)
+# then you must specify that port in this url otherwise your generated urls will be
+# incorrect.
+#
+# The hostname of this url will be extracted for SSH and GIT protocol repository
+# url generation.
+#
+# e.g. web.canonicalUrl = https://dev.gitblit.com
+#      web.canonicalUrl = https://dev.gitblit.com:8443
 #
 # SINCE 1.4.0
 web.canonicalUrl = 
@@ -1285,7 +1316,7 @@
 #
 # SPACE-DELIMITED
 # SINCE 0.5.0
-web.prettyPrintExtensions = aea agc basic c cbm cl clj cpp cs css dart el erl erlang frm fs go groovy hs htm html java js latex lisp ll llvm lsp lua ml moxie mumps n nemerle pascal php pl prefs properties proto py r R rb rd Rd rkt s S scala scm sh Splus sql ss tcl tex vb vbs vhd vhdl wiki xml xq xquery yaml yml ymlapollo
+web.prettyPrintExtensions = aea agc basic c cbm cl clj cpp cs css dart el erl erlang frm fs go groovy hs htm html java js latex lisp ll llvm lsp lua ml moxie mumps n nemerle pascal php pl pm prefs properties proto py r R rb rd Rd rkt s S scala scm sh Splus sql ss tcl tex vb vbs vhd vhdl wiki xml xq xquery yaml yml ymlapollo
 
 # Registered extensions for markdown transformation
 #
@@ -1409,6 +1440,11 @@
 
 # use SMTPs flag
 mail.smtps = false
+
+# use STARTTLS flag
+#
+# SINCE 1.6.0
+mail.starttls = false
 
 # if your smtp server requires authentication, supply the credentials here
 #
@@ -1779,7 +1815,8 @@
 realm.redmine.url = http://example.com/redmine
 
 #
-# Server Settings
+# Gitblit GO Server Settings
+# The following settings only affect the integrated GO variant.
 #
 
 # The temporary folder to decompress the embedded gitblit webapp. 
@@ -1789,7 +1826,9 @@
 # BASEFOLDER
 server.tempFolder = ${baseFolder}/temp
 
-# Specify the maximum number of concurrent http/https worker threads to allow. 
+# Specify the maximum number of concurrent http/https Jetty worker
+# threads to allow.  This setting does not affect other threaded
+# daemons and components of Gitblit.
 #
 # SINCE 1.3.0
 # RESTART REQUIRED

--
Gitblit v1.9.1