From 54f2c813608a01955858ab1d48de7ce33b5dfff4 Mon Sep 17 00:00:00 2001 From: James Moger Date: Fri, 19 Oct 2012 21:44:45 -0400 Subject: [PATCH] Split committer verification description into two strings --- docs/01_setup.mkd | 2 -- docs/04_releases.mkd | 2 +- src/com/gitblit/wicket/GitBlitWebApp.properties | 3 ++- src/com/gitblit/wicket/pages/EditRepositoryPage.html | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/docs/01_setup.mkd b/docs/01_setup.mkd index a9ce767e..b5c407ea 100644 --- a/docs/01_setup.mkd +++ b/docs/01_setup.mkd @@ -277,8 +277,6 @@ Prior to v1.2.0, Gitblit has two main access permission groupings: #### Committer Verification -Experimental - You may optionally enable committer verification which requires that each commit be committed by the authenticated user pushing the commits. i.e. If Bob is pushing the commits, Bob **must** be the committer of those commits. **How is this enforced?** diff --git a/docs/04_releases.mkd b/docs/04_releases.mkd index 70e0ad2f..0cf060e4 100644 --- a/docs/04_releases.mkd +++ b/docs/04_releases.mkd @@ -44,7 +44,7 @@ In order to fork a repository, the user account must have the *fork* permission - Delete branch feature (issue 121, Github/ajermakovics) - Added line links to blob view (issue 130) - Added RedmineUserService (github/mallowlabs) -- Experimental support for committer verification. Requires use of *--no-ff* when merging branches or pull requests. See setup page for details. +- Support for committer verification. Requires use of *--no-ff* when merging branches or pull requests. See setup page for details. #### changes diff --git a/src/com/gitblit/wicket/GitBlitWebApp.properties b/src/com/gitblit/wicket/GitBlitWebApp.properties index e46bb0ed..bdeb4a95 100644 --- a/src/com/gitblit/wicket/GitBlitWebApp.properties +++ b/src/com/gitblit/wicket/GitBlitWebApp.properties @@ -342,7 +342,8 @@ gb.canCreate = can create gb.canCreateDescription = can create personal repositories gb.illegalPersonalRepositoryLocation = your personal repository must be located at \"{0}\" gb.verifyCommitter = verify committer -gb.verifyCommitterDescription = require committer identity to match pushing Gitblt user account (all merges require "--no-ff" to enforce committer identity) +gb.verifyCommitterDescription = require committer identity to match pushing Gitblt user account +gb.verifyCommitterNote = all merges require "--no-ff" to enforce committer identity gb.repositoryPermissions = repository permissions gb.userPermissions = user permissions gb.teamPermissions = team permissions diff --git a/src/com/gitblit/wicket/pages/EditRepositoryPage.html b/src/com/gitblit/wicket/pages/EditRepositoryPage.html index 9a98e165..b85568d4 100644 --- a/src/com/gitblit/wicket/pages/EditRepositoryPage.html +++ b/src/com/gitblit/wicket/pages/EditRepositoryPage.html @@ -35,7 +35,7 @@
- +
-- 2.39.5