opendev/gerrit
Code Issues Proposed changes

Merge changes Id344fa76,I6210ea17

Browse Source 
* changes:
  Velocity: Enable strict reference mode
  Update ChangeSubject velocity template to use Velocity 1.7 syntax
This commit is contained in:
Shawn Pearce
2014-05-10 03:00:54 +00:00
committed by Gerrit Code Review
parent 7bbd9eaa26 9fd935b708
commit f6e27e6e55
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gerrit-server/src/main/java/com/google/gerrit/server/mail/VelocityRuntimeProvider.java
View File

@@ -45,6 +45,7 @@ public class VelocityRuntimeProvider implements Provider<RuntimeInstance> {
p.setProperty(RuntimeConstants.VM_PERM_INLINE_LOCAL, "true"); p.setProperty(RuntimeConstants.VM_PERM_INLINE_LOCAL, "true");
p.setProperty(RuntimeConstants.RUNTIME_LOG_LOGSYSTEM_CLASS, p.setProperty(RuntimeConstants.RUNTIME_LOG_LOGSYSTEM_CLASS,
Slf4jLogChute.class.getName()); Slf4jLogChute.class.getName());
p.setProperty(RuntimeConstants.RUNTIME_REFERENCES_STRICT, "true");
p.setProperty("runtime.log.logsystem.log4j.category", "velocity"); p.setProperty("runtime.log.logsystem.log4j.category", "velocity");
if (site.mail_dir.isDirectory()) { if (site.mail_dir.isDirectory()) {

2
gerrit-server/src/main/resources/com/google/gerrit/server/mail/ChangeFooter.vm
View File

@@ -41,7 +41,7 @@ To view, visit $email.changeUrl
To unsubscribe, visit $email.settingsUrl To unsubscribe, visit $email.settingsUrl
#set ($notblank = 1) #set ($notblank = 1)
#end #end
#if ($notblank == 1) #if ($notblank)
#end #end
Gerrit-MessageType: $messageClass Gerrit-MessageType: $messageClass

2
gerrit-server/src/main/resources/com/google/gerrit/server/mail/ChangeSubject.vm
View File

@@ -34,4 +34,4 @@
#macro(ellipsis $length $str) #macro(ellipsis $length $str)
#if($str.length() > $length)#set($length = $length - 3)${str.substring(0,$length)}...#else$str#end #if($str.length() > $length)#set($length = $length - 3)${str.substring(0,$length)}...#else$str#end
#end #end
Change in $projectName.replaceAll('/.*/', '...')[$branch.shortName]: #ellipsis(63, $change.subject) Change in ${projectName.replaceAll('/.*/', '...')}[$branch.shortName]: #ellipsis(63, $change.subject)