summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-10-11 14:18:21 -0300
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-10-19 14:58:26 -0200
commit73bfc15cd4fc681015e84f7db8507e38e4ca8b59 (patch)
tree5e040a7b80231cd3438075297a1a18362eac132f
parent2deef25eb0c87db2fddf8b25c95891650d9c43a7 (diff)
downloadgitlab-ce-73bfc15cd4fc681015e84f7db8507e38e4ca8b59.tar.gz
Always use symbols for type on LabelsHelper#link_to_label
-rw-r--r--app/helpers/labels_helper.rb2
-rw-r--r--app/views/projects/merge_requests/_merge_request.html.haml2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/labels_helper.rb b/app/helpers/labels_helper.rb
index e8992c114b0..af8741f5e06 100644
--- a/app/helpers/labels_helper.rb
+++ b/app/helpers/labels_helper.rb
@@ -46,7 +46,7 @@ module LabelsHelper
end
end
- def label_filter_path(subject, label, type: issue)
+ def label_filter_path(subject, label, type: :issue)
case subject
when Group
send("#{type.to_s.pluralize}_group_path",
diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml
index ad62bf50b57..12408068834 100644
--- a/app/views/projects/merge_requests/_merge_request.html.haml
+++ b/app/views/projects/merge_requests/_merge_request.html.haml
@@ -62,7 +62,7 @@
- if merge_request.labels.any?
&nbsp;
- merge_request.labels.each do |label|
- = link_to_label(label, subject: merge_request.project, type: 'merge_request')
+ = link_to_label(label, subject: merge_request.project, type: :merge_request)
- if merge_request.tasks?
&nbsp;
%span.task-status