diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-03-22 00:17:02 +0300 |
|---|---|---|
| committer | DJ Mountney <david@twkie.net> | 2017-03-22 00:22:03 +0300 |
| commit | d830256391bd2d00424b6c78bec659419792b1b9 (patch) | |
| tree | 30ab20df91e00b3517a3638ae31770cd8bb20c67 | |
| parent | add9adbb01b8079d75af9fed53e66ce419ce3274 (diff) | |
Merge branch 'dm-fix-vue-cant-compile-some-discussions' into 'master'
Escape values passed from Rails to Vue to make sure the template can be compiled
See merge request !10122
| -rw-r--r-- | app/views/projects/notes/_note.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml index a7618370a5d..58455b0c844 100644 --- a/app/views/projects/notes/_note.html.haml +++ b/app/views/projects/notes/_note.html.haml @@ -37,7 +37,7 @@ ":can-resolve" => can_resolve, ":author-name" => "'#{j(note.author.name)}'", "author-avatar" => note.author.avatar_url, - ":note-truncated" => "'#{truncate(note.note, length: 17)}'", + ":note-truncated" => "'#{j(truncate(note.note, length: 17))}'", ":resolved-by" => "'#{j(note.resolved_by.try(:name))}'", "v-show" => "#{can_resolve || note.resolved?}", "inline-template" => true, |