opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.15' into stable-2.16

Browse Source 
* stable-2.15:
  Make wording of "Merged" html and text templates consistent
  BaseInit: Don't throw if schema cannot be upgraded

Change-Id: If5f1230a893c644b07b899aa1e1403c01cc5f6d5
This commit is contained in:
David Pursehouse
2019-07-10 19:52:39 +09:00
parent 4dde1ff7e9 8109e14607
commit 14d5609992
3 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/com/google/gerrit/server/mail/Merged.soy
View File

@@ -25,7 +25,7 @@
* @param fromName
*/
{template .Merged kind="text"}
{$fromName} has submitted this change and it was merged.
{$fromName} has submitted this change.
{if $email.changeUrl} ( {$email.changeUrl} ){/if}{\n}
{\n}
Change subject: {$change.subject}{\n}

2
resources/com/google/gerrit/server/mail/MergedHtml.soy
View File

@@ -23,7 +23,7 @@
*/
{template .MergedHtml}
<p>
{$fromName} <strong>merged</strong> this change.
{$fromName} <strong>submitted</strong> this change.
</p>
{if $email.changeUrl}