James Moger
2012-10-19 54f2c813608a01955858ab1d48de7ce33b5dfff4
Split committer verification description into two strings
4 files modified
9 ■■■■■ changed files
docs/01_setup.mkd 2 ●●●●● patch | view | raw | blame | history
docs/04_releases.mkd 2 ●●● patch | view | raw | blame | history
src/com/gitblit/wicket/GitBlitWebApp.properties 3 ●●●● patch | view | raw | blame | history
src/com/gitblit/wicket/pages/EditRepositoryPage.html 2 ●●● patch | view | raw | blame | history
docs/01_setup.mkd
@@ -277,8 +277,6 @@
#### Committer Verification
<span class='label label-warning'>Experimental</span>
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?**
docs/04_releases.mkd
@@ -44,7 +44,7 @@
- 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
src/com/gitblit/wicket/GitBlitWebApp.properties
@@ -342,7 +342,8 @@
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
src/com/gitblit/wicket/pages/EditRepositoryPage.html
@@ -35,7 +35,7 @@
                <tr><th colspan="2"><hr/></th></tr>
                <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>
                <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>
                <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>
                <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>
                <tr><th colspan="2"><hr/></th></tr>
                <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>
                <tr><th colspan="2"><hr/></th></tr>