summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-04-22 15:56:54 +0000
committerYorick Peterse <yorickpeterse@gmail.com>2016-04-25 19:49:57 +0000
commit438f41594a4e912069e8369d02b07401e957479a (patch)
treec93c0c16e001b80650f36f8e826132d9c0d6231d
parent777a8b2af549ff120b9524fa1881aff26284ec82 (diff)
downloadgitlab-ce-438f41594a4e912069e8369d02b07401e957479a.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