Commit 9ba5f10f authored by Robert Speicher's avatar Robert Speicher

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
parents 6cc88580 a3111e14
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
":can-resolve" => can_resolve, ":can-resolve" => can_resolve,
":author-name" => "'#{j(note.author.name)}'", ":author-name" => "'#{j(note.author.name)}'",
"author-avatar" => note.author.avatar_url, "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))}'", ":resolved-by" => "'#{j(note.resolved_by.try(:name))}'",
"v-show" => "#{can_resolve || note.resolved?}", "v-show" => "#{can_resolve || note.resolved?}",
"inline-template" => true, "inline-template" => true,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment