diff options
| author | James Moger <james.moger@gitblit.com> | 2014-03-08 11:53:38 -0500 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-03-08 11:53:38 -0500 |
| commit | b335dda6b2a2254e2d4c3162ea945496d9a0eb58 (patch) | |
| tree | 042fec3a35b9a3e9be26b07ff400ee2d1d4ced54 /src/main | |
| parent | cc1c3ffa7d261d2e8bcdc600253528e8d09e1d06 (diff) | |
| download | gitblit-b335dda6b2a2254e2d4c3162ea945496d9a0eb58.tar.gz gitblit-b335dda6b2a2254e2d4c3162ea945496d9a0eb58.zip | |
Fix integration branch in propose instructions
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/com/gitblit/wicket/pages/TicketPage.java | 6 |
1 files changed, 5 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 1c0544c8..d3ddc89f 100644 --- a/src/main/java/com/gitblit/wicket/pages/TicketPage.java +++ b/src/main/java/com/gitblit/wicket/pages/TicketPage.java @@ -988,7 +988,11 @@ public class TicketPage extends TicketBasePage { md = md.replace("${ticketId}", "" + ticketId);
md = md.replace("${patchset}", "" + 1);
md = md.replace("${reviewBranch}", Repository.shortenRefName(PatchsetCommand.getTicketBranch(ticketId)));
- md = md.replace("${integrationBranch}", Repository.shortenRefName(getRepositoryModel().HEAD));
+ String integrationBranch = Repository.shortenRefName(getRepositoryModel().HEAD);
+ if (!StringUtils.isEmpty(ticket.mergeTo)) {
+ integrationBranch = ticket.mergeTo;
+ }
+ md = md.replace("${integrationBranch}", integrationBranch);
return MarkdownUtils.transformMarkdown(md);
}
|