opendev/gerrit
Code Issues Proposed changes

Merge "Modifies change-related email templates"

Browse Source
This commit is contained in:
Shawn Pearce
2016-06-18 20:46:42 +00:00
committed by Gerrit Code Review
parent 6fbc067b51 b5778b801d
commit 5816efcf8b
9 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-server/src/main/resources/com/google/gerrit/server/mail/Abandoned.vm
View File

@@ -32,7 +32,9 @@
## to a change being abandoned. It is a ChangeEmail: see ChangeSubject.vm and ## to a change being abandoned. It is a ChangeEmail: see ChangeSubject.vm and
## ChangeFooter.vm. ## ChangeFooter.vm.
## ##
$fromName has abandoned this change. $fromName has abandoned this change.#**
*##if($email.changeUrl) ( $email.changeUrl )#end
Change subject: $change.subject Change subject: $change.subject
...................................................................... ......................................................................

4
gerrit-server/src/main/resources/com/google/gerrit/server/mail/Comment.vm
View File

@@ -33,7 +33,9 @@
## ChangeSubject.vm, ChangeFooter.vm and CommentFooter.vm. ## ChangeSubject.vm, ChangeFooter.vm and CommentFooter.vm.
## ##
#if ($email.coverLetter || $email.hasInlineComments()) #if ($email.coverLetter || $email.hasInlineComments())
$fromName has posted comments on this change. $fromName has posted comments on this change.#**
*##if($email.changeUrl) ( $email.changeUrl )#end
Change subject: $change.subject Change subject: $change.subject
...................................................................... ......................................................................

5
gerrit-server/src/main/resources/com/google/gerrit/server/mail/DeleteReviewer.vm
View File

@@ -32,7 +32,10 @@
## related to removal of a reviewer (and the reviewer's votes) from reviews. ## related to removal of a reviewer (and the reviewer's votes) from reviews.
## It is a ChangeEmail: see ChangeSubject.vm and ChangeFooter.vm. ## It is a ChangeEmail: see ChangeSubject.vm and ChangeFooter.vm.
## ##
$fromName has removed $email.joinStrings($email.reviewerNames, ', ') from this change. $fromName has removed $email.joinStrings($email.reviewerNames, ', ') from #**
*#this change.#**
*##if($email.changeUrl) ( $email.changeUrl )#end
Change subject: $change.subject Change subject: $change.subject
...................................................................... ......................................................................

4
gerrit-server/src/main/resources/com/google/gerrit/server/mail/MergeFail.vm
View File

@@ -32,7 +32,9 @@
## to a failure upon attempting to merge a change to the head. It is a ## to a failure upon attempting to merge a change to the head. It is a
## ChangeEmail: see ChangeSubject.vm and ChangeFooter.vm. ## ChangeEmail: see ChangeSubject.vm and ChangeFooter.vm.
## ##
$fromName has submitted this change and it FAILED to merge. $fromName has submitted this change and it FAILED to merge.#**
*##if($email.changeUrl) ( $email.changeUrl )#end
Change subject: $change.subject Change subject: $change.subject
...................................................................... ......................................................................

4
gerrit-server/src/main/resources/com/google/gerrit/server/mail/Merged.vm
View File

@@ -32,7 +32,9 @@
## a change successfully merged to the head. It is a ChangeEmail: see ## a change successfully merged to the head. It is a ChangeEmail: see
## ChangeSubject.vm and ChangeFooter.vm. ## ChangeSubject.vm and ChangeFooter.vm.
## ##
$fromName has submitted this change and it was merged. $fromName has submitted this change and it was merged.#**
*##if($email.changeUrl) ( $email.changeUrl )#end
Change subject: $change.subject Change subject: $change.subject
...................................................................... ......................................................................

10
gerrit-server/src/main/resources/com/google/gerrit/server/mail/NewChange.vm
View File

@@ -42,12 +42,10 @@ I'd like you to do a code review.#if($email.changeUrl) Please visit
to review the following change. to review the following change.
#end #end
#else #else
$fromName has uploaded a new change for review. $fromName has uploaded a new change for review.#**
#if($email.changeUrl) *##if($email.changeUrl) ( $email.changeUrl )#end
#end
$email.changeUrl
#end
#end
Change subject: $change.subject Change subject: $change.subject
...................................................................... ......................................................................
@@ -59,4 +57,4 @@ $email.changeDetail
#if($email.includeDiff) #if($email.includeDiff)
$email.UnifiedDiff $email.UnifiedDiff
#end #end

4
gerrit-server/src/main/resources/com/google/gerrit/server/mail/ReplacePatchSet.vm
View File

@@ -42,7 +42,9 @@ I'd like you to reexamine a change.#if($email.changeUrl) Please visit
to look at the new patch set (#$patchSet.patchSetId). to look at the new patch set (#$patchSet.patchSetId).
#end #end
#else #else
$fromName has uploaded a new patch set (#$patchSet.patchSetId). $fromName has uploaded a new patch set (#$patchSet.patchSetId).#**
*##if($email.changeUrl) ( $email.changeUrl )#end
#end #end
Change subject: $change.subject Change subject: $change.subject

4
gerrit-server/src/main/resources/com/google/gerrit/server/mail/Restored.vm
View File

@@ -32,7 +32,9 @@
## to a change being restored. It is a ChangeEmail: see ChangeSubject.vm and ## to a change being restored. It is a ChangeEmail: see ChangeSubject.vm and
## ChangeFooter.vm. ## ChangeFooter.vm.
## ##
$fromName has restored this change. $fromName has restored this change.#**
*##if($email.changeUrl) ( $email.changeUrl )#end
Change subject: $change.subject Change subject: $change.subject
...................................................................... ......................................................................

4
gerrit-server/src/main/resources/com/google/gerrit/server/mail/Reverted.vm
View File

@@ -32,7 +32,9 @@
## to a change being reverted. It is a ChangeEmail: see ChangeSubject.vm and ## to a change being reverted. It is a ChangeEmail: see ChangeSubject.vm and
## ChangeFooter.vm. ## ChangeFooter.vm.
## ##
$fromName has reverted this change. $fromName has reverted this change.#**
*##if($email.changeUrl) ( $email.changeUrl )#end
Change subject: $change.subject Change subject: $change.subject
...................................................................... ......................................................................