opendev/gerrit
Code Issues Proposed changes

Remove unused MergeFail mail template

Browse Source 
Change-Id: Ib8e0f57a686f5cda235759b7528be8012304aecb
This commit is contained in:
David Pursehouse
2016-06-28 18:17:01 +09:00
parent 3b284822db
commit 399b10dea7
3 changed files with 0 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/config-mail.txt
View File

@@ -80,12 +80,6 @@ The `Merged.vm` template will determine the contents of the email related to
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`.
=== MergeFail.vm
The `MergeFail.vm` template will determine the contents of the email related
to a failure upon attempting to merge a change to the head. It is a
`ChangeEmail`: see `ChangeSubject.vm` and `ChangeFooter.vm`.
=== NewChange.vm === NewChange.vm
The `NewChange.vm` template will determine the contents of the email related The `NewChange.vm` template will determine the contents of the email related

1
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/SitePathInitializer.java
View File

@@ -109,7 +109,6 @@ public class SitePathInitializer {
extractMailExample("DeleteVote.vm"); extractMailExample("DeleteVote.vm");
extractMailExample("Footer.vm"); extractMailExample("Footer.vm");
extractMailExample("Merged.vm"); extractMailExample("Merged.vm");
extractMailExample("MergeFail.vm");
extractMailExample("NewChange.vm"); extractMailExample("NewChange.vm");
extractMailExample("RegisterNewEmail.vm"); extractMailExample("RegisterNewEmail.vm");
extractMailExample("ReplacePatchSet.vm"); extractMailExample("ReplacePatchSet.vm");

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

@@ -1,46 +0,0 @@
## Copyright (C) 2010 The Android Open Source Project
##
## Licensed under the Apache License, Version 2.0 (the "License");
## you may not use this file except in compliance with the License.
## You may obtain a copy of the License at
##
## http://www.apache.org/licenses/LICENSE-2.0
##
## Unless required by applicable law or agreed to in writing, software
## distributed under the License is distributed on an "AS IS" BASIS,
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
## See the License for the specific language governing permissions and
## limitations under the License.
##
##
## Template Type:
## -------------
## This is a velocity mail template, see: http://velocity.apache.org and the
## gerrit-docs:config-mail.txt for more info on modifying gerrit mail templates.
##
## Template File Names and extensions:
## ----------------------------------
## Gerrit will use templates ending in ".vm" but will ignore templates ending
## in ".vm.example". If a .vm template does not exist, the default internal
## gerrit template which is the same as the .vm.example will be used. If you
## want to override the default template, copy the .vm.example file to a .vm
## file and edit it appropriately.
##
## This Template:
## --------------
## The MergeFail.vm template will determine the contents of the email related
## to a failure upon attempting to merge a change to the head. It is a
## ChangeEmail: see ChangeSubject.vm and ChangeFooter.vm.
##
$fromName has submitted this change and it FAILED to merge.#**
*##if($email.changeUrl) ( $email.changeUrl )#end
Change subject: $change.subject
......................................................................
#if ($email.coverLetter)
$email.coverLetter
#end