summaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
authorPatrick Hiesel <hiesel@google.com>2018-03-23 10:47:02 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2018-03-23 10:47:02 +0000
commita01d3ab6601120b799ecba11c980b1f6dcb290c5 (patch)
tree351370c87b63507260c3f586631fa74e243344ca /resources
parentcb4b1e3a8baff44ada0ef33daf0ee3d20631f891 (diff)
parent8d129d41f5764faf1b2864652113b5e5acd8fb4a (diff)
Merge "Add Gerrit's instance name and reference it in notification emails"
Diffstat (limited to 'resources')
-rw-r--r--resources/com/google/gerrit/server/mail/ChangeSubject.soy8
1 files changed, 7 insertions, 1 deletions
diff --git a/resources/com/google/gerrit/server/mail/ChangeSubject.soy b/resources/com/google/gerrit/server/mail/ChangeSubject.soy
index d8cffc4129..62092ae0ff 100644
--- a/resources/com/google/gerrit/server/mail/ChangeSubject.soy
+++ b/resources/com/google/gerrit/server/mail/ChangeSubject.soy
@@ -22,7 +22,13 @@
* @param branch
* @param change
* @param shortProjectName
+ * @param instanceAndProjectName
+ * @param addInstanceNameInSubject boolean
*/
{template .ChangeSubject kind="text"}
- Change in {$shortProjectName}[{$branch.shortName}]: {$change.shortSubject}
+ {if $addInstanceNameInSubject}
+ Change in {$shortProjectName}[{$branch.shortName}]: {$change.shortSubject}
+ {else}
+ Change in {$instanceAndProjectName}[{$branch.shortName}]: {$change.shortSubject}
+ {/if}
{/template}