diff options
| author | Phil Hughes <me@iamphill.com> | 2017-06-28 09:42:24 +0000 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-06-28 23:29:10 +0100 |
| commit | 5bf817734ed92db8c2b750a7af406793d5e11b82 (patch) | |
| tree | 24277e3579061686052b6b8d6b645441ece5d04b | |
| parent | 7016bb7bee81db4afa7e9d7ba0ba12d0ac1e1dd8 (diff) | |
| download | gitlab-ce-5bf817734ed92db8c2b750a7af406793d5e11b82.tar.gz | |
Merge branch '34430-fix-double-escape-comment-edit' into 'master'
Remove unnecessary call to `_.escape`
Closes #34430
See merge request !12505
| -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 2a999dd61ba..e0a30d2648a 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -1502,7 +1502,7 @@ const normalizeNewlines = function(str) { 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>'); |