From 2bd0c5e34a254009fe034a9cec5324e55166c4c8 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Mon, 07 Apr 2014 23:03:31 -0400 Subject: [PATCH] Fix possible NPE when deleting a repository and cleaning-up branch-based tickets --- src/main/java/com/gitblit/wicket/GitBlitWebApp.properties | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties index e52623e..2ab023f 100644 --- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties +++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties @@ -668,4 +668,5 @@ gb.repositoryIsFrozen = This repository is frozen. gb.repositoryDoesNotAcceptPatchsets = This repository does not accept patchsets. gb.serverDoesNotAcceptPatchsets = This server does not accept patchsets. -gb.ticketIsClosed = This ticket is closed. \ No newline at end of file +gb.ticketIsClosed = This ticket is closed. +gb.mergeToDescription = default integration branch for merging ticket patchsets -- Gitblit v1.9.1