summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-04-22 15:56:54 +0000
committerJacob Schatz <jschatz@gitlab.com>2016-04-22 15:56:54 +0000
commit7d199b7fcc454a450cdba0f3278ed589ac4d6bd1 (patch)
treebb9577b2f86b6d8e2b9b8abf9315887a8a4bbea9
parent10aaea1c91bbdd65b6afef0ae5981e9aa154ca5c (diff)
parent83adcf19b77898d3033500920973ed73ceb7c3c0 (diff)
downloadgitlab-ce-7d199b7fcc454a450cdba0f3278ed589ac4d6bd1.tar.gz
Merge branch 'escape-label-title' into 'master'
Correctly escapes label title in filters Fixes #15522 See merge request !3880
-rw-r--r--app/assets/javascripts/labels_select.js.coffee2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/labels_select.js.coffee b/app/assets/javascripts/labels_select.js.coffee
index 516f7d19932..85517b18c5a 100644
--- a/app/assets/javascripts/labels_select.js.coffee
+++ b/app/assets/javascripts/labels_select.js.coffee
@@ -223,7 +223,7 @@ class @LabelsSelect
fieldName: $dropdown.data('field-name')
id: (label) ->
if $dropdown.hasClass("js-filter-submit") and not label.isAny?
- label.title
+ _.escape label.title
else
label.id