diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2016-10-18 17:39:26 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-10-18 17:39:26 +0000 |
| commit | 136ea6940792b0cd9814856a72fee5fd872c2be3 (patch) | |
| tree | 7a8f5223016bcdcb3ab04eb77f3fe11607f8b6c1 /app/helpers | |
| parent | 2f7e1c0ead6b6bca102c674707ea8ee55ba55fa1 (diff) | |
| parent | 4012c695cb17f77f3fc928e9eef5c2fd679defc1 (diff) | |
| download | gitlab-ce-136ea6940792b0cd9814856a72fee5fd872c2be3.tar.gz | |
Merge branch '23311-fix-double-escaping' into 'master'
Stop event_commit_title from escaping its output
Fixes a double-escape issue (actually triple-escape!) viewing the activity feed
Closes #23311
Related to #23258 !6832
See merge request !6930
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/events_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index bfedcb1c42b..f8ded05c31a 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -154,7 +154,7 @@ module EventsHelper end def event_commit_title(message) - escape_once(truncate(message.split("\n").first, length: 70)) + (message.split("\n").first || "").truncate(70) rescue "--broken encoding" end |