From: James Moger <james.moger@gitblit.com>
Date: Fri, 26 Sep 2014 13:06:29 +0000 (-0400)
Subject: Respect repository default integration branch for new proposal tickets
X-Git-Tag: v1.6.1~23^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Ftickets%2F35%2F135%2F2;p=gitblit.git

Respect repository default integration branch for new proposal tickets
---

diff --git a/src/main/java/com/gitblit/git/PatchsetReceivePack.java b/src/main/java/com/gitblit/git/PatchsetReceivePack.java
index d9404cb4..54ffb7ba 100644
--- a/src/main/java/com/gitblit/git/PatchsetReceivePack.java
+++ b/src/main/java/com/gitblit/git/PatchsetReceivePack.java
@@ -151,6 +151,11 @@ public class PatchsetReceivePack extends GitblitReceivePack {
 			LOGGER.error("failed to determine default branch for " + repository.name, e);
 		}
 
+		if (!StringUtils.isEmpty(getRepositoryModel().mergeTo)) {
+			// repository settings specifies a default integration branch
+			defaultBranch = Repository.shortenRefName(getRepositoryModel().mergeTo);
+		}
+
 		long ticketId = 0L;
 		try {
 			ticketId = Long.parseLong(branch);