diff options
| author | James Moger <james.moger@gitblit.com> | 2014-03-09 12:38:31 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-03-09 12:38:31 -0400 |
| commit | 328346fbed4c620cd0ad675ab03551d9790fb3e3 (patch) | |
| tree | dbd96a39996abdb041eb22e60d58a29c4e68ad32 /src/main | |
| parent | 19b98b71d09b37435ccf7cf94694223093e5719b (diff) | |
| download | gitblit-328346fbed4c620cd0ad675ab03551d9790fb3e3.tar.gz gitblit-328346fbed4c620cd0ad675ab03551d9790fb3e3.zip | |
Fixed incorrect ticket fetch instructions in email notifications
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/com/gitblit/tickets/TicketNotifier.java | 1 | ||||
| -rw-r--r-- | src/main/java/com/gitblit/tickets/commands.md | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/com/gitblit/tickets/TicketNotifier.java b/src/main/java/com/gitblit/tickets/TicketNotifier.java index 313f1a7d..6ff76def 100644 --- a/src/main/java/com/gitblit/tickets/TicketNotifier.java +++ b/src/main/java/com/gitblit/tickets/TicketNotifier.java @@ -489,6 +489,7 @@ public class TicketNotifier { instructions = instructions.replace("${ticketRef}", ticketBranch); instructions = instructions.replace("${patchsetRef}", patchsetBranch); instructions = instructions.replace("${reviewBranch}", reviewBranch); + instructions = instructions.replace("${ticketBranch}", ticketBranch); return instructions; } diff --git a/src/main/java/com/gitblit/tickets/commands.md b/src/main/java/com/gitblit/tickets/commands.md index 44098d28..da889865 100644 --- a/src/main/java/com/gitblit/tickets/commands.md +++ b/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} |