diff options
| author | Florian Zschocke <florian.zschocke@cycos.com> | 2014-06-23 04:12:19 +0200 |
|---|---|---|
| committer | Florian Zschocke <florian.zschocke@cycos.com> | 2014-09-07 22:40:18 +0200 |
| commit | 90fc5ac5dbe6d5093525ab55c8d81c8277121550 (patch) | |
| tree | 5020447fe3cf11bac93e40c50e55dadf31fec8f1 /src/main/java/com/gitblit/wicket/GitBlitWebApp.properties | |
| parent | eb252616d18811e611fe10f048fb9b04460df671 (diff) | |
| download | gitblit-ticket/104.tar.gz gitblit-ticket/104.zip | |
Add merge type setting to repository page.ticket/104
The merge type is a per repository setting. Add it to the edit page.
Diffstat (limited to 'src/main/java/com/gitblit/wicket/GitBlitWebApp.properties')
| -rw-r--r-- | src/main/java/com/gitblit/wicket/GitBlitWebApp.properties | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties index eb92e2d2..eefebcca 100644 --- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties +++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties @@ -659,6 +659,7 @@ gb.nTotalTickets = {0} total gb.body = body gb.mergeSha = mergeSha gb.mergeTo = merge to +gb.mergeType = merge type gb.labels = labels gb.reviewers = reviewers gb.voters = voters @@ -670,6 +671,7 @@ gb.repositoryDoesNotAcceptPatchsets = This repository does not accept patchsets. gb.serverDoesNotAcceptPatchsets = This server does not accept patchsets. gb.ticketIsClosed = This ticket is closed. gb.mergeToDescription = default integration branch for merging ticket patchsets +gb.mergeTypeDescription = merge a ticket fast-forward only, if necessary, or always with a merge commit to the integration branch gb.anonymousCanNotPropose = Anonymous users can not propose patchsets. gb.youDoNotHaveClonePermission = You are not permitted to clone this repository. gb.myTickets = my tickets @@ -741,4 +743,4 @@ gb.sshKeyCommentDescription = Enter an optional comment. If blank, the comment w gb.permission = Permission gb.sshKeyPermissionDescription = Specify the access permission for the SSH key gb.transportPreference = Transport Preference -gb.transportPreferenceDescription = Set the transport that you prefer to use for cloning
\ No newline at end of file +gb.transportPreferenceDescription = Set the transport that you prefer to use for cloning |