Split committer verification description into two strings

diff --git a/docs/01_setup.mkd b/docs/01_setup.mkd
index a9ce767e3ad637a2f9af3ed7284e77f45b83e600..b5c407eae1ce097f7d7049f05b606a70769e15ee 100644 (file)
--- 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:
 \r
 #### Committer Verification\r
 \r
-<span class='label label-warning'>Experimental</span>\r
-\r
 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.\r
 \r
 **How is this enforced?**\r

diff --git a/docs/04_releases.mkd b/docs/04_releases.mkd
index 70e0ad2f662d959766fcc7ba47d3240405df6998..0cf060e47dd9525062040e87124055edaa2a9d5e 100644 (file)
--- 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)\r
 - Added line links to blob view (issue 130)\r
 - Added RedmineUserService (github/mallowlabs)\r
-- Experimental support for committer verification.  Requires use of *--no-ff* when merging branches or pull requests.  See setup page for details.\r
+- Support for committer verification.  Requires use of *--no-ff* when merging branches or pull requests.  See setup page for details.\r
 \r
 #### changes\r
 \r

diff --git a/src/com/gitblit/wicket/GitBlitWebApp.properties b/src/com/gitblit/wicket/GitBlitWebApp.properties
index e46bb0edfbd7bae1f43c6431a53283606b7ab7ed..bdeb4a958416e1535bab15a96d49edd35a669925 100644 (file)
--- 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\r
 gb.illegalPersonalRepositoryLocation = your personal repository must be located at \"{0}\"\r
 gb.verifyCommitter = verify committer\r
-gb.verifyCommitterDescription = require committer identity to match pushing Gitblt user account (all merges require "--no-ff" to enforce committer identity)\r
+gb.verifyCommitterDescription = require committer identity to match pushing Gitblt user account\r
+gb.verifyCommitterNote = all merges require "--no-ff" to enforce committer identity\r
 gb.repositoryPermissions = repository permissions\r
 gb.userPermissions = user permissions\r
 gb.teamPermissions = team permissions\r

diff --git a/src/com/gitblit/wicket/pages/EditRepositoryPage.html b/src/com/gitblit/wicket/pages/EditRepositoryPage.html
index 9a98e16574e3a53d0bf7d29eeeff7ec7380e7bb5..b85568d48a8bb40a4f01a6c036ee677b33ec1eae 100644 (file)
--- a/src/com/gitblit/wicket/pages/EditRepositoryPage.html
+++ b/src/com/gitblit/wicket/pages/EditRepositoryPage.html
@@ -35,7 +35,7 @@
                                <tr><th colspan="2"><hr/></th></tr>\r
                                <tr><th><wicket:message key="gb.isFrozen"></wicket:message></th><td class="edit"><label class="checkbox"><input type="checkbox" wicket:id="isFrozen" tabindex="16" /> &nbsp;<span class="help-inline"><wicket:message key="gb.isFrozenDescription"></wicket:message></span></label></td></tr>\r
                                <tr><th><wicket:message key="gb.allowForks"></wicket:message></th><td class="edit"><label class="checkbox"><input type="checkbox" wicket:id="allowForks" tabindex="17" /> &nbsp;<span class="help-inline"><wicket:message key="gb.allowForksDescription"></wicket:message></span></label></td></tr>\r
-                               <tr><th><wicket:message key="gb.verifyCommitter"></wicket:message></th><td class="edit"><label class="checkbox"><input type="checkbox" wicket:id="verifyCommitter" tabindex="18" /> &nbsp;<span class="help-inline"><wicket:message key="gb.verifyCommitterDescription"></wicket:message></span></label></td></tr>\r
+                               <tr><th style="vertical-align: top;"><wicket:message key="gb.verifyCommitter"></wicket:message></th><td class="edit"><label class="checkbox"><input type="checkbox" wicket:id="verifyCommitter" tabindex="18" /> &nbsp;<span class="help-inline"><wicket:message key="gb.verifyCommitterDescription"></wicket:message></span><br/><span class="help-inline" style="padding-left:10px;"><wicket:message key="gb.verifyCommitterNote"></wicket:message></span></label></td></tr>\r
                                <tr><th colspan="2"><hr/></th></tr>\r
                                <tr><th style="vertical-align: top;"><wicket:message key="gb.permittedUsers"></wicket:message></th><td style="padding:2px;"><span wicket:id="users"></span></td></tr>\r
                                <tr><th colspan="2"><hr/></th></tr>\r