Insert space and colon after comment link We used to insert space to prevent gmail linkification from including beginning of the next line into the link. This seems to no longer work. Add space AND colon to achieve the same result Also remove link to Issue 9201 as the issue has been deleted (don't know why or when), so the reference to it doesn't help. Google-Bug-Id: b/265879486 Release-Notes: skip Change-Id: I72a2676a410c2b6c86cb4f1f2634221b478998e4
diff --git a/javatests/com/google/gerrit/acceptance/server/change/CommentsIT.java b/javatests/com/google/gerrit/acceptance/server/change/CommentsIT.java index 2123ac2..15baa78 100644 --- a/javatests/com/google/gerrit/acceptance/server/change/CommentsIT.java +++ b/javatests/com/google/gerrit/acceptance/server/change/CommentsIT.java
@@ -1262,7 +1262,7 @@ + c + "/comment/" + ps1List.get(0).id - + " \n" + + " :\n" + "PS1, Line 1: initial\n" + "what happened to this?\n" + "\n" @@ -1274,7 +1274,7 @@ + c + "/comment/" + ps1List.get(1).id - + " \n" + + " :\n" + "PS1, Line 1: boring\n" + "Is it that bad?\n" + "\n" @@ -1288,7 +1288,7 @@ + c + "/comment/" + ps2List.get(0).id - + " \n" + + " :\n" + "PS2, Line 1: initial content\n" + "comment 1 on base\n" + "\n" @@ -1300,7 +1300,7 @@ + c + "/comment/" + ps2List.get(1).id - + " \n" + + " :\n" + "PS2, Line 2: \n" + "comment 2 on base\n" + "\n" @@ -1312,7 +1312,7 @@ + c + "/comment/" + ps2List.get(2).id - + " \n" + + " :\n" + "PS2, Line 1: interesting\n" + "better now\n" + "\n" @@ -1324,7 +1324,7 @@ + c + "/comment/" + ps2List.get(3).id - + " \n" + + " :\n" + "PS2, Line 2: cntent\n" + "typo: content\n" + "\n"
diff --git a/resources/com/google/gerrit/server/mail/Comment.soy b/resources/com/google/gerrit/server/mail/Comment.soy index 98ab4b2..4b621b5 100644 --- a/resources/com/google/gerrit/server/mail/Comment.soy +++ b/resources/com/google/gerrit/server/mail/Comment.soy
@@ -77,13 +77,8 @@ {for $line, $index in $comment.lines} {if $index == 0} {if $comment.startLine != 0} - {$comment.link} + {$comment.link}{sp}:{\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}