opendev/gerrit
Code Issues Proposed changes

Merge "Insert space to prevent overagressive email linkification"

Browse Source
This commit is contained in:
Wyatt Allen 2018-06-19 19:45:35 +00:00 committed by Gerrit Code Review
commit e1e25bc78b
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
javatests/com/google/gerrit/acceptance/server/change/CommentsIT.java
View File

@ -634,13 +634,13 @@ public class CommentsIT extends AbstractDaemonTest {
+ url
+ "#/c/"
+ c
+ "/1/a.txt\n"
+ "/1/a.txt \n"
+ "File a.txt:\n"
+ "\n"
+ url
+ "#/c/"
+ c
+ "/1/a.txt@a2\n"
+ "/1/a.txt@a2 \n"
+ "PS1, Line 2: \n"
+ "what happened to this?\n"
+ "\n"
@ -648,7 +648,7 @@ public class CommentsIT extends AbstractDaemonTest {
+ url
+ "#/c/"
+ c
+ "/1/a.txt@1\n"
+ "/1/a.txt@1 \n"
+ "PS1, Line 1: ew\n"
+ "nit: trailing whitespace\n"
+ "\n"
@ -656,13 +656,13 @@ public class CommentsIT extends AbstractDaemonTest {
+ url
+ "#/c/"
+ c
+ "/2/a.txt\n"
+ "/2/a.txt \n"
+ "File a.txt:\n"
+ "\n"
+ url
+ "#/c/"
+ c
+ "/2/a.txt@a1\n"
+ "/2/a.txt@a1 \n"
+ "PS2, Line 1: \n"
+ "comment 1 on base\n"
+ "\n"
@ -670,7 +670,7 @@ public class CommentsIT extends AbstractDaemonTest {
+ url
+ "#/c/"
+ c
+ "/2/a.txt@a2\n"
+ "/2/a.txt@a2 \n"
+ "PS2, Line 2: \n"
+ "comment 2 on base\n"
+ "\n"
@ -678,7 +678,7 @@ public class CommentsIT extends AbstractDaemonTest {
+ url
+ "#/c/"
+ c
+ "/2/a.txt@1\n"
+ "/2/a.txt@1 \n"
+ "PS2, Line 1: ew\n"
+ "join lines\n"
+ "\n"
@ -686,7 +686,7 @@ public class CommentsIT extends AbstractDaemonTest {
+ url
+ "#/c/"
+ c
+ "/2/a.txt@2\n"
+ "/2/a.txt@2 \n"
+ "PS2, Line 2: nten\n"
+ "typo: content\n"
+ "\n"

11
resources/com/google/gerrit/server/mail/Comment.soy
View File

@ -39,7 +39,9 @@
{/if}
{for $group in $commentFiles}
{$group.link}{\n}
// Insert a space before the newline so that Gmail does not mistakenly link
// the following line with the file link. See issue 9201.
{$group.link}{sp}{\n}
{$group.title}:{\n}
{\n}
@ -53,7 +55,12 @@
{if isFirst($line)}
{if $comment.startLine != 0}
{$comment.link}
{/if}{\n}
{/if}
// Insert a space before the newline so that Gmail does not mistakenly
// link the following line with the file link. See issue 9201.
{sp}{\n}
{$comment.linePrefix}
{else}
{$comment.linePrefixEmpty}