Ryan Lane has submitted this change and it was merged.
Change subject: Updating gitblit to 1.3.0-SNAPSHOT
......................................................................
Updating gitblit to 1.3.0-SNAPSHOT
Change-Id: I12227f948af2eaaf446a427a3975ceb05d7d711c
---
M files/gitblit/gitblit.properties
1 file changed, 106 insertions(+), 8 deletions(-)
Approvals:
Ryan Lane: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/gitblit/gitblit.properties b/files/gitblit/gitblit.properties
index 5284778..8fa99ae 100644
--- a/files/gitblit/gitblit.properties
+++ b/files/gitblit/gitblit.properties
@@ -82,6 +82,23 @@
# SINCE 1.1.0
git.submoduleUrlPatterns = .*?://github.com/(.*)
+# Specify the interface for Git Daemon to bind it's service.
+# You may specify an ip or an empty value to bind to all interfaces.
+# Specifying localhost will result in Gitblit ONLY listening to requests to
+# localhost.
+#
+# SINCE 1.3.0
+# RESTART REQUIRED
+git.daemonBindInterface = localhost
+
+# port for serving the Git Daemon service. <= 0 disables this service.
+# On Unix/Linux systems, ports < 1024 require root permissions.
+# Recommended value: 9418
+#
+# SINCE 1.3.0
+# RESTART REQUIRED
+git.daemonPort = 9418
+
# Allow push/pull over http/https with JGit servlet.
# If you do NOT want to allow Git clients to clone/push to Gitblit set this
# to false. You might want to do this if you are only using ssh:// or git://.
@@ -151,6 +168,17 @@
#
# SINCE 1.1.0
git.defaultAuthorizationControl = NAMED
+
+# 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.
+#
+# If incremental push tags are enabled, the tips of each branch in the push
will
+# be tagged with an increasing revision integer.
+#
+# e.g. refs/tags/r2345 or refs/tags/rev_2345
+#
+# SINCE 1.3.0
+git.defaultIncrementalPushTagPrefix = r
# Enable JGit-based garbage collection. (!!EXPERIMENTAL!!)
#
@@ -446,6 +474,12 @@
# RESTART REQUIRED
web.authenticateViewPages = false
+# If web.authenticateViewPages=true you may optionally require a client-side
+# basic authentication prompt instead of the standard form-based login.
+#
+# SINCE 1.3.0
+web.enforceHttpBasicAuthentication = false
+
# Require admin authentication for the admin functions and pages
#
# SINCE 0.5.0
@@ -723,13 +757,25 @@
web.forwardSlashCharacter = /
# 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.
+# Use spaces to separate urls.
+#
+# {0} is the token for the repository name
+# {1} is the token for the username
+#
+# The username is only practical if you have setup your other git serving
+# solutions accounts to have the same username as the Gitblit account.
+#
# e.g.
-# web.otherUrls = ssh://localhost/git/{0} git://localhost/git/{0}
+# web.otherUrls = ssh://localhost/git/{0} git://localhost/git/{0}
https://{1}@localhost/r/{0}
#
# SPACE-DELIMITED
# SINCE 0.5.0
web.otherUrls = https://gerrit.wikimedia.org/r/p/{0}
ssh://gerrit.wikimedia.org:29418/{0}
+
+# Should app-specific clone links be displayed for SourceTree, SparkleShare,
etc?
+#
+# SINCE 1.3.0
+web.allowAppCloneLinks = true
# Choose how to present the repositories list.
# grouped = group nested/subfolder repositories together (no sorting)
@@ -794,10 +840,22 @@
web.summaryRefsCount = 5
# The number of items to show on a page before showing the first, prev, next
-# pagination links. A default if 50 is used for any invalid value.
+# pagination links. A default of 50 is used for any invalid value.
#
# SINCE 0.5.0
web.itemsPerPage = 50
+
+# The number of pushes to display on the overview page
+# Value must exceed 0 else default of 5 is used
+#
+# SINCE 1.3.0
+web.overviewPushCount = 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.
+#
+# SINCE 1.3.0
+web.pushesPerPage = 10
# Registered file extensions to ignore during Lucene indexing
#
@@ -809,7 +867,7 @@
#
# SPACE-DELIMITED
# SINCE 0.5.0
-web.prettyPrintExtensions = c cpp cs css frm groovy htm html java js php pl
prefs properties py rb scala sh sql xml vb
+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
# Registered extensions for markdown transformation
#
@@ -842,6 +900,16 @@
# RESTART REQUIRED
web.debugMode = false
+# Force a default locale for all users, ignoring the browser's settings.
+# An empty value allows Gitblit to use the translation preferred by the
browser.
+#
+# Changing this value while the server is running will only affect new
sessions.
+#
+# e.g. web.forceDefaultLocale = en
+#
+# SINCE 1.3.0
+web.forceDefaultLocale =
+
# Enable/disable global regex substitutions (i.e. shared across repositories)
#
# SINCE 0.5.0
@@ -858,10 +926,6 @@
regex.global.rt = \\b([rR][tT]\\:?\\s+#?(\\d+))\\b!!!<a
href="https://rt.wikimedia.org/Ticket/Display.html?id=$2";>$1</a>
regex.global.cve = \\b(CVE\\-\\d{4}\\-\\d+)\\b!!!<a
href="https://cve.mitre.org/cgi-bin/cvename.cgi?name=$1";>$1</a>
regex.global.gerriturl = \\bhttps://gerrit.wikimedia.org/r/(\\d+)\\b!!!<a
href="https://gerrit.wikimedia.org/r/$1";>https://gerrit.wikimedia.org/r/$1</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>
#
# Mail Settings
@@ -1153,6 +1217,34 @@
# SINCE 1.0.0
realm.ldap.email = email
+# Defines the cache period to be used when caching LDAP queries. This is
currently
+# only used for LDAP user synchronization.
+#
+# Must be of the form ' ' where is one of 'MILLISECONDS', 'SECONDS',
'MINUTES', 'HOURS', 'DAYS'
+# default: 2 MINUTES
+#
+# RESTART REQUIRED
+realm.ldap.ldapCachePeriod = 2 MINUTES
+
+# Defines whether to synchronize all LDAP users into the backing user service
+#
+# Valid values: true, false
+# If left blank, false is assumed
+realm.ldap.synchronizeUsers.enable = false
+
+# Defines whether to delete non-existent LDAP users from the backing user
service
+# during synchronization. depends on realm.ldap.synchronizeUsers.enable = true
+#
+# Valid values: true, false
+# If left blank, true is assumed
+realm.ldap.synchronizeUsers.removeDeleted = true
+
+# Attribute on the USER record that indicate their username to be used in
gitblit
+# when synchronizing users from LDAP
+# if blank, Gitblit will use uid
+# For MS Active Directory this may be sAMAccountName
+realm.ldap.uid = uid
+
# The RedmineUserService must be backed by another user service for standard
user
# and team management.
# default: users.conf
@@ -1181,6 +1273,12 @@
# RESTART REQUIRED
server.useNio = true
+# Specify the maximum number of concurrent http/https worker threads to allow.
+#
+# SINCE 1.3.0
+# RESTART REQUIRED
+server.threadPoolSize = 50
+
# Context path for the GO application. You might want to change the context
# path if running Gitblit behind a proxy layer such as mod_proxy.
#
--
To view, visit https://gerrit.wikimedia.org/r/67110
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I12227f948af2eaaf446a427a3975ceb05d7d711c
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Demon <[email protected]>
Gerrit-Reviewer: Demon <[email protected]>
Gerrit-Reviewer: Ryan Lane <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
