summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-04-26 09:13:03 +0100
committerPhil Hughes <me@iamphill.com>2016-04-26 09:13:03 +0100
commit0158b86d8c1d5f72a249420e5f91ea8e59ff218b (patch)
tree0a8179269e11f0ff3ec48c76150978268b5305c7 /app
parent6ff740ff9484691750f3eadf12125fd362efe61c (diff)
downloadgitlab-ce-0158b86d8c1d5f72a249420e5f91ea8e59ff218b.tar.gz
Updated label links to work correctly for filteringsidebar-label-link
See !3846#note_5033951
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/labels_select.js.coffee2
-rw-r--r--app/helpers/labels_helper.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/labels_select.js.coffee b/app/assets/javascripts/labels_select.js.coffee
index 85517b18c5a..7d61cd9bf73 100644
--- a/app/assets/javascripts/labels_select.js.coffee
+++ b/app/assets/javascripts/labels_select.js.coffee
@@ -30,7 +30,7 @@ class @LabelsSelect
if issueUpdateURL
labelHTMLTemplate = _.template(
'<% _.each(labels, function(label){ %>
- <a href="<%= ["",issueURLSplit[1], issueURLSplit[2],""].join("/") %>issues?label_name=<%= _.escape(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 %>; color: <%= label.text_color %>;">
<%= _.escape(label.title) %>
</span>
diff --git a/app/helpers/labels_helper.rb b/app/helpers/labels_helper.rb
index 3dded7c2f23..c99b137cdaa 100644
--- a/app/helpers/labels_helper.rb
+++ b/app/helpers/labels_helper.rb
@@ -37,7 +37,7 @@ module LabelsHelper
link = send("namespace_project_#{type.to_s.pluralize}_path",
project.namespace,
project,
- label_name: label.name)
+ label_name: [label.name])
if block_given?
link_to link, &block