From f084f468756bde745d8e8e27c729f6e57bea5749 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Tue, 17 Sep 2013 17:34:00 -0400 Subject: [PATCH] Implemented a graph servlet based on EGit/JGit's PlotWalk (issue-194) --- src/main/distrib/data/gitblit.properties | 146 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 144 insertions(+), 2 deletions(-) diff --git a/src/main/distrib/data/gitblit.properties b/src/main/distrib/data/gitblit.properties index d5573a6..3c0f1d1 100644 --- a/src/main/distrib/data/gitblit.properties +++ b/src/main/distrib/data/gitblit.properties @@ -163,6 +163,23 @@ # SINCE 1.1.0 git.defaultAuthorizationControl = NAMED +# The prefix for a users personal repository directory. +# +# Personal user repositories are created in this directory, named by the user name +# prefixed with the userRepositoryPrefix. For eaxmple, a user 'john' would have his +# personal repositories in the directory '~john'. +# +# Cannot be an empty string. Also, absolute paths are changed to relative paths by +# removing the first directory separator. +# +# It is not recommended to change this value AFTER your user's have created +# personal repositories because it will break all permissions, ownership, and +# repository push/pull operations. +# +# RESTART REQUIRED +# SINCE 1.4.0 +git.userRepositoryPrefix = ~ + # 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. # @@ -173,6 +190,18 @@ # # SINCE 1.3.0 git.defaultIncrementalPushTagPrefix = r + +# Controls creating a repository as --shared on Unix servers. +# +# In an Unix environment where mixed access methods exist for shared repositories, +# the repository should be created with 'git init --shared' to make sure that +# it can be accessed e.g. via ssh (user git) and http (user www-data). +# +# Valid values are the values available for the '--shared' option. The the manual +# page for 'git init' for more information on shared repositories. +# +# SINCE 1.4.0 +git.createRepositoriesShared = false # Enable JGit-based garbage collection. (!!EXPERIMENTAL!!) # @@ -501,6 +530,8 @@ # com.gitblit.RedmineUserService # com.gitblit.SalesforceUserService # com.gitblit.WindowsUserService +# com.gitblit.PAMUserService +# com.gitblit.HtpasswdUserService # # Any custom user service implementation must have a public default constructor. # @@ -530,6 +561,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. @@ -568,6 +646,13 @@ # SINCE 1.0.0 # BASEFOLDER web.robots.txt = ${baseFolder}/robots.txt + +# The number of minutes to cache a page in the browser since the last request. +# The default value is 0 minutes. A value <= 0 disables all page caching which +# is the default behavior for Gitblit <= 1.3.0. +# +# SINCE 1.3.1 +web.pageCacheExpires = 0 # If true, the web ui layout will respond and adapt to the browser's dimensions. # if false, the web ui will use a 940px fixed-width layout. @@ -815,6 +900,11 @@ # SINCE 0.5.0 web.generateActivityGraph = true +# Displays the commits branch graph in the summary page and commits/log page. +# +# SINCE 1.4.0 +web.showBranchGraph = true + # The default number of days to show on the activity page. # Value must exceed 0 else default of 7 is used # @@ -826,6 +916,11 @@ # SPACE-DELIMITED # SINCE 1.3.0 web.activityDurationChoices = 1 3 7 14 21 28 + +# Maximum number of days of activity that may be displayed on the activity page. +# +# SINCE 1.3.2 +web.activityDurationMaximum = 30 # 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 @@ -884,7 +979,7 @@ # # SPACE-DELIMITED # SINCE 0.9.0 -web.luceneIgnoreExtensions = 7z arc arj bin bmp dll doc docx exe gif gz jar jpg lib lzh odg odf odt pdf ppt png so swf xcf xls xlsx zip +web.luceneIgnoreExtensions = 7z arc arj bin bmp dll doc docx exe gif gz jar jpg lib lzh odg odf odt pdf ppt pptx png so swf tar xcf xls xlsx zip # Registered extensions for google-code-prettify # @@ -909,7 +1004,7 @@ # # SPACE-DELIMITED # SINCE 0.5.0 -web.binaryExtensions = jar pdf tar.gz zip +web.binaryExtensions = 7z arc arj bin dll doc docx exe gz jar lib lzh odg odf odt pdf ppt pptx so tar xls xlsx zip # Aggressive heap management will run the garbage collector on every generated # page. This slows down page generation a little but improves heap consumption. @@ -1158,6 +1253,53 @@ # SINCE 1.3.0 realm.windows.defaultDomain = +# The PAMUserService must be backed by another user service for standard user +# and team management. +# default: users.conf +# +# RESTART REQUIRED +# BASEFOLDER +# SINCE 1.3.1 +realm.pam.backingUserService = ${baseFolder}/users.conf + +# The PAM service name for authentication. +# default: system-auth +# +# SINCE 1.3.1 +realm.pam.serviceName = system-auth + +# The HtpasswdUserService must be backed by another user service for standard user +# and team management and attributes. This can be one of the local Gitblit user services. +# default: users.conf +# +# RESTART REQUIRED +# BASEFOLDER +# SINCE 1.3.2 +realm.htpasswd.backingUserService = ${baseFolder}/users.conf + +# The Apache htpasswd file that contains the users and passwords. +# default: ${baseFolder}/htpasswd +# +# RESTART REQUIRED +# BASEFOLDER +# SINCE 1.3.2 +realm.htpasswd.userfile = ${baseFolder}/htpasswd + +# Determines how accounts are looked up upon login. +# +# If set to false, then authentication for local accounts is done against +# the backing user service. +# If set to true, then authentication will first be checked against the +# htpasswd store, even if the account appears as a local account in the +# backing user service. If the user is found in the htpasswd store, then +# an already existing local account will be turned into an external account. +# In this case an initial local password is never used and gets overwritten +# by the externally stored password upon login. +# default: false +# +# SINCE 1.3.2 +realm.htpasswd.overrideLocalAuthentication = false + # The SalesforceUserService must be backed by another user service for standard user # and team management. # default: users.conf -- Gitblit v1.9.1