Merge branch 'ticket/135' into develop

James Moger

2014-09-26 ba04d6d62e443cbd23c0544094aa2e55d01b2d0f

Merge branch 'ticket/135' into develop

 src/main/java/com/gitblit/git/PatchsetReceivePack.java

@@ -151,6 +151,11 @@
            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);