From 5bf817734ed92db8c2b750a7af406793d5e11b82 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 28 Jun 2017 09:42:24 +0000
Subject: Merge branch '34430-fix-double-escape-comment-edit' into 'master'

Remove unnecessary call to `_.escape`

Closes #34430

See merge request !12505
---
 app/assets/javascripts/notes.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

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>');
 
-- 
cgit v1.2.3