From 633d4c7a0cdf0b5eb2b01abfc6a058ac27e86d21 Mon Sep 17 00:00:00 2001 From: David Ostrovsky <david@ostrovsky.org> Date: Thu, 10 Apr 2014 18:58:09 -0400 Subject: [PATCH] doAuthenticate() method doesn't need to be protected --- 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