Allow configuring the default integration branch for a repository

James Moger

2014-03-08 f1b8822f715ea00da6b7d39a8ea63864aeda2d39

 src/main/java/com/gitblit/wicket/pages/TicketPage.java

@@ -988,7 +988,7 @@
      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;

      }