diff options
| author | James Moger <james.moger@gitblit.com> | 2014-03-08 15:39:36 -0500 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-03-08 15:39:36 -0500 |
| commit | f1b8822f715ea00da6b7d39a8ea63864aeda2d39 (patch) | |
| tree | 7346119f7339db023df9e4457cc840e645ee4303 /src/main/java/com/gitblit/wicket/pages/TicketPage.java | |
| parent | ea07809018ab5266e5568a63144a9998a3c95af8 (diff) | |
| download | gitblit-f1b8822f715ea00da6b7d39a8ea63864aeda2d39.tar.gz gitblit-f1b8822f715ea00da6b7d39a8ea63864aeda2d39.zip | |
Allow configuring the default integration branch for a repository
Diffstat (limited to 'src/main/java/com/gitblit/wicket/pages/TicketPage.java')
| -rw-r--r-- | src/main/java/com/gitblit/wicket/pages/TicketPage.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/com/gitblit/wicket/pages/TicketPage.java b/src/main/java/com/gitblit/wicket/pages/TicketPage.java index 434882f4..1a1686d3 100644 --- a/src/main/java/com/gitblit/wicket/pages/TicketPage.java +++ b/src/main/java/com/gitblit/wicket/pages/TicketPage.java @@ -988,7 +988,7 @@ public class TicketPage extends TicketBasePage { md = md.replace("${ticketId}", "" + ticketId);
md = md.replace("${patchset}", "" + 1);
md = md.replace("${reviewBranch}", Repository.shortenRefName(PatchsetCommand.getTicketBranch(ticketId)));
- String integrationBranch = Repository.shortenRefName(getRepositoryModel().HEAD);
+ String integrationBranch = Repository.shortenRefName(getRepositoryModel().mergeTo);
if (!StringUtils.isEmpty(ticket.mergeTo)) {
integrationBranch = ticket.mergeTo;
}
|