diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-04-20 19:40:55 +0300 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-04-20 19:40:55 +0300 |
| commit | 7b6fe0e25933243c2dd2826a592f4239c862dc9d (patch) | |
| tree | a47508da8baeeb57426b41936a6feec08efb0e21 /app/assets/javascripts/labels_select.js.coffee | |
| parent | e784958cb5396d745e43797988bacf9c9a27e9f4 (diff) | |
| parent | 364354bce442e2058491e549bbacfbea0c007c0d (diff) | |
Merge remote-tracking branch 'origin/master' into label-dropdown-fix
# Conflicts:
# app/views/shared/issuable/_sidebar.html.haml
Diffstat (limited to 'app/assets/javascripts/labels_select.js.coffee')
| -rw-r--r-- | app/assets/javascripts/labels_select.js.coffee | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/javascripts/labels_select.js.coffee b/app/assets/javascripts/labels_select.js.coffee index 602fc4be07e..b8282db76b0 100644 --- a/app/assets/javascripts/labels_select.js.coffee +++ b/app/assets/javascripts/labels_select.js.coffee @@ -29,13 +29,13 @@ class @LabelsSelect if issueUpdateURL labelHTMLTemplate = _.template( '<% _.each(labels, function(label){ %> - <a href="<%= ["",issueURLSplit[1], issueURLSplit[2],""].join("/") %>issues?label_name=<%= label.title %>"> - <span class="label has-tooltip color-label" title="<%= label.description %>" style="background-color: <%= label.color %>;"> - <%= label.title %> + <a href="<%= ["",issueURLSplit[1], issueURLSplit[2],""].join("/") %>issues?label_name=<%= _.escape(label.title) %>"> + <span class="label has-tooltip color-label" title="<%= _.escape(label.description) %>" style="background-color: <%= label.color %>;"> + <%= _.escape(label.title) %> </span> </a> <% }); %>' - ); + ) labelNoneHTMLTemplate = _.template('<div class="light">None</div>') if newLabelField.length @@ -191,7 +191,7 @@ class @LabelsSelect "<li> <a href='#' class='#{selectedClass}'> #{color} - #{label.title} + #{_.escape(label.title)} </a> </li>" filterable: true |