From b8e1fa94f3f28a94b466c79b1a4b24c6fd755df1 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Wed, 12 Mar 2014 21:44:36 -0400 Subject: [PATCH] Improve logging of received patchset command --- src/main/distrib/data/gitblit.properties | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 110 insertions(+), 3 deletions(-) diff --git a/src/main/distrib/data/gitblit.properties b/src/main/distrib/data/gitblit.properties index 35ae16a..70a6c6e 100644 --- a/src/main/distrib/data/gitblit.properties +++ b/src/main/distrib/data/gitblit.properties @@ -83,7 +83,7 @@ # # SINCE 1.3.0 # RESTART REQUIRED -git.daemonBindInterface = localhost +git.daemonBindInterface = # port for serving the Git Daemon service. <= 0 disables this service. # On Unix/Linux systems, ports < 1024 require root permissions. @@ -381,6 +381,33 @@ # Common unit suffixes of k, m, or g are supported. # Documentation courtesy of the Gerrit project. # +# +# NOTE: The importance of JGit's streamFileTreshold AND Git's bigFileThreshold +# ISSUE: https://bugs.eclipse.org/bugs/show_bug.cgi?id=394078 +# +# "core.bigFileThreshold +# +# Files larger than this size are stored deflated, without +# attempting delta compression. Storing large files without +# delta compression avoids excessive memory usage, at the +# slight expense of increased disk usage. +# +# Default is 512 MiB on all platforms. +# This should be reasonable for most projects as source code and other +# text files can still be delta compressed, +# but larger binary media files won't be." +# -- Git documentation +# +# If streamFileTreshold < bigFileTreshold you _may_ spend alot of time waiting +# for push and/or fetch to complete. It may even look hung. +# +# Until the issue is resolved gracefully, a workaround is to configure +# bigFileThreshold < streamFileTreshold AND then repack the repository. +# +# e.g. from the repository folder with Gitblit NOT running: +# git config core.bigFileTreshold 40m +# git gc --aggressive +# # SINCE 1.0.0 # RESTART REQUIRED git.streamFileThreshold = 50m @@ -401,6 +428,76 @@ # SINCE 1.0.0 # RESTART REQUIRED git.packedGitMmap = false + +# Use the Gitblit patch receive pack for processing contributions and tickets. +# This allows the user to push a patch using the familiar Gerrit syntax: +# +# git push <remote> HEAD:refs/for/<targetBranch> +# +# NOTE: +# This requires git.enableGitServlet = true AND it requires an authenticated +# git transport connection (http/https) when pushing from a client. +# +# Valid services include: +# com.gitblit.tickets.FileTicketService +# com.gitblit.tickets.BranchTicketService +# com.gitblit.tickets.RedisTicketService +# +# SINCE 1.4.0 +# RESTART REQUIRED +tickets.service = + +# Globally enable or disable creation of new bug, enhancement, task, etc tickets +# for all repositories. +# +# If false, no tickets can be created through the ui for any repositories. +# If true, each repository can control if they allow new tickets to be created. +# +# NOTE: +# If a repository is accepting patchsets, new proposal tickets can be created +# regardless of this setting. +# +# SINCE 1.4.0 +tickets.acceptNewTickets = true + +# Globally enable or disable pushing patchsets to all repositories. +# +# If false, no patchsets will be accepted for any repositories. +# If true, each repository can control if they accept new patchsets. +# +# NOTE: +# If a repository is accepting patchsets, new proposal tickets can be created +# regardless of the acceptNewTickets setting. +# +# SINCE 1.4.0 +tickets.acceptNewPatchsets = true + +# Default setting to control patchset merge through the web ui. If true, patchsets +# must have an approval score to enable the merge button. This setting can be +# overriden per-repository. +# +# SINCE 1.4.0 +tickets.requireApproval = false + +# Specify the location of the Lucene Ticket index +# +# SINCE 1.4.0 +# RESTART REQUIRED +tickets.indexFolder = ${baseFolder}/tickets/lucene + +# Define the url for the Redis server. +# +# e.g. redis://localhost:6379 +# redis://:foobared@localhost:6379/2 +# +# SINCE 1.4.0 +# RESTART REQUIRED +tickets.redis.url = + +# The number of tickets to display on a page. +# +# SINCE 1.4.0 +tickets.perPage = 25 # # Groovy Integration @@ -501,7 +598,7 @@ # # SINCE 1.2.1 # RESTART REQUIRED -fanout.bindInterface = localhost +fanout.bindInterface = # port for serving the Fanout PubSub service. <= 0 disables this service. # On Unix/Linux systems, ports < 1024 require root permissions. @@ -680,6 +777,14 @@ # # SINCE 0.5.0 web.allowAdministration = true + +# Setting to disable rendering the top-level navigation header which includes +# the login form, top-level links like dashboard, repositories, search, etc. +# This setting is only useful if you plan to embed Gitblit within another page +# or system. +# +# SINCE 1.4.0 +web.hideHeader = false # Allows rpc clients to list repositories and possibly manage or administer the # Gitblit server, if the authenticated account has administrator permissions. @@ -1147,6 +1252,7 @@ # Enable/disable global regex substitutions (i.e. shared across repositories) # # SINCE 0.5.0 +# DEPRECATED 1.4.0 (migrate to bugtraq instead) regex.global = true # Example global regex substitutions @@ -1478,7 +1584,8 @@ # LDAP users or groups that should be given administrator privileges. # # Teams are specified with a leading '@' character. Groups with spaces in the -# name can be entered as "@team name". +# name can be entered as "@team name". This setting only applies when using +# LDAP to maintain team memberships. # # e.g. realm.ldap.admins = john @git_admins "@git admins" # -- Gitblit v1.9.1