diff options
| author | Phil Hughes <me@iamphill.com> | 2017-06-28 09:42:24 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-06-28 09:42:24 +0000 |
| commit | 41320cb8a0583ec9b440d6e440a35cf0899b9837 (patch) | |
| tree | 341623639c095511e89eedafb64aaa6bd178d2ff /app | |
| parent | a2e13104b160bd92ad5c0fd5a242afa877f2557e (diff) | |
| parent | df4e731a9f2946f4144188e9415030e3789f0fd8 (diff) | |
| download | gitlab-ce-41320cb8a0583ec9b440d6e440a35cf0899b9837.tar.gz | |
Merge branch '34430-fix-double-escape-comment-edit' into 'master'
Remove unnecessary call to `_.escape`
Closes #34430
See merge request !12505
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/notes.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js index b21d7774920..34476f3303f 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -1485,7 +1485,7 @@ export default class Notes { const cachedNoteBodyText = $noteBodyText.html(); // Show updated comment content temporarily - $noteBodyText.html(_.escape(formContent)); + $noteBodyText.html(formContent); $editingNote.removeClass('is-editing fade-in-full').addClass('being-posted fade-in-half'); $editingNote.find('.note-headline-meta a').html('<i class="fa fa-spinner fa-spin" aria-label="Comment is being updated" aria-hidden="true"></i>'); |