diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-03-17 21:16:08 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-03-17 21:16:08 +0300 |
| commit | e6f4a4c1ae26f6bdbede1e0ddcced45e2f1461e5 (patch) | |
| tree | cf35e87ca55f32893e98d62bcd4176018ae4b792 /app/assets | |
| parent | d90c2505862870d10a6c8d268420020814ef608c (diff) | |
| parent | adeafa40b84051b10c62752f4883691449633276 (diff) | |
Merge branch 'fixed-diff-avatar-tooltip-escaping' into 'master'
Fixes diff comment avatar tooltip escaping issues
Closes #29572
See merge request !10012
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/diff_notes/components/diff_note_avatars.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/javascripts/diff_notes/components/diff_note_avatars.js b/app/assets/javascripts/diff_notes/components/diff_note_avatars.js index 788daa96b3d..dd7081aefb7 100644 --- a/app/assets/javascripts/diff_notes/components/diff_note_avatars.js +++ b/app/assets/javascripts/diff_notes/components/diff_note_avatars.js @@ -25,6 +25,7 @@ import collapseIcon from '../icons/collapse_icon.svg'; role="button" data-container="body" data-placement="top" + data-html="true" :data-line-type="lineType" :title="note.authorName + ': ' + note.noteTruncated" :src="note.authorAvatar" |