James Moger
2014-03-09 328346fbed4c620cd0ad675ab03551d9790fb3e3
Fixed incorrect ticket fetch instructions in email notifications
2 files modified
5 ■■■■■ changed files
src/main/java/com/gitblit/tickets/TicketNotifier.java 1 ●●●● patch | view | raw | blame | history
src/main/java/com/gitblit/tickets/commands.md 4 ●●●● patch | view | raw | blame | history
src/main/java/com/gitblit/tickets/TicketNotifier.java
@@ -489,6 +489,7 @@
        instructions = instructions.replace("${ticketRef}", ticketBranch);
        instructions = instructions.replace("${patchsetRef}", patchsetBranch);
        instructions = instructions.replace("${reviewBranch}", reviewBranch);
        instructions = instructions.replace("${ticketBranch}", ticketBranch);
        return instructions;
    }
src/main/java/com/gitblit/tickets/commands.md
@@ -2,10 +2,10 @@
To review an updated patchset
    git fetch && git checkout ${reviewBranch} && git pull --ff-only
    git fetch && git checkout ${ticketBranch} && git pull --ff-only
To review a rewritten patchset
    git fetch && git checkout ${reviewBranch} && git reset --hard origin/${reviewBranch}
    git fetch && git checkout ${ticketBranch} && git reset --hard origin/${ticketBranch}