From f1b8822f715ea00da6b7d39a8ea63864aeda2d39 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Sat, 08 Mar 2014 15:39:36 -0500 Subject: [PATCH] Allow configuring the default integration branch for a repository --- src/main/java/com/gitblit/wicket/GitBlitWebApp.properties | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties index 9f090c8..2ab023f 100644 --- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties +++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties @@ -669,3 +669,4 @@ 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 -- Gitblit v1.9.1