summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWinnie Hellmann <winnie@gitlab.com>2018-05-25 16:22:17 +0200
committerWinnie Hellmann <winnie@gitlab.com>2018-05-25 18:31:51 +0200
commitc909a392b647d90d98b09d4b5c958810f3f0fc69 (patch)
tree8cd47e2f4db4ae645d6f9e9ed132e21a60a1a836
parentd51d893307c453280bf425c793bb15370c5ecfd8 (diff)
downloadgitlab-ce-c909a392b647d90d98b09d4b5c958810f3f0fc69.tar.gz
Remove duplicate escaping from branch dropdown
-rw-r--r--app/assets/javascripts/compare_autocomplete.js2
-rw-r--r--changelogs/unreleased/winh-new-merge-request-encoding.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/javascripts/compare_autocomplete.js b/app/assets/javascripts/compare_autocomplete.js
index 9c88466e576..15cdc751570 100644
--- a/app/assets/javascripts/compare_autocomplete.js
+++ b/app/assets/javascripts/compare_autocomplete.js
@@ -54,7 +54,7 @@ export default function initCompareAutocomplete(limitTo = null, clickHandler = (
.attr('href', '#')
.addClass(ref === selected ? 'is-active' : '')
.text(ref)
- .attr('data-ref', escape(ref));
+ .attr('data-ref', ref);
return $('<li />').append(link);
}
},
diff --git a/changelogs/unreleased/winh-new-merge-request-encoding.yml b/changelogs/unreleased/winh-new-merge-request-encoding.yml
new file mode 100644
index 00000000000..f797657e660
--- /dev/null
+++ b/changelogs/unreleased/winh-new-merge-request-encoding.yml
@@ -0,0 +1,5 @@
+---
+title: Fix encoding of branch names on compare and new merge request page
+merge_request: 19143
+author:
+type: fixed