James Moger
2014-03-08 b335dda6b2a2254e2d4c3162ea945496d9a0eb58
Fix integration branch in propose instructions
1 files modified
6 ■■■■ changed files
src/main/java/com/gitblit/wicket/pages/TicketPage.java 6 ●●●● patch | view | raw | blame | history
src/main/java/com/gitblit/wicket/pages/TicketPage.java
@@ -988,7 +988,11 @@
        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);
    }