summaryrefslogtreecommitdiff
path: root/app/views/shared
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2018-01-18 17:21:41 +0000
committerSean McGivern <sean@mcgivern.me.uk>2018-01-18 17:21:41 +0000
commit210e6e8a654a026443af1fd1f007a5fc093e7ac2 (patch)
treefa01a090fedc9d5efca909cb200aa4b7e1269fa8 /app/views/shared
parent91374baf8685cc58bb7334ed131bc223ad0875e2 (diff)
parenta956fac221e9e20e04e9b8557ac84ff4f920c891 (diff)
downloadgitlab-ce-210e6e8a654a026443af1fd1f007a5fc093e7ac2.tar.gz
Merge branch 'issue_37143_2' into 'master'
Remove unnecessary query from labels dropdown Closes #37143 See merge request gitlab-org/gitlab-ce!16520
Diffstat (limited to 'app/views/shared')
-rw-r--r--app/views/shared/issuable/_filter.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/shared/issuable/_filter.html.haml b/app/views/shared/issuable/_filter.html.haml
index 8442d7ff4a2..7704c88905b 100644
--- a/app/views/shared/issuable/_filter.html.haml
+++ b/app/views/shared/issuable/_filter.html.haml
@@ -22,7 +22,7 @@
= render "shared/issuable/milestone_dropdown", selected: finder.milestones.try(:first), name: :milestone_title, show_any: true, show_upcoming: true, show_started: true
.filter-item.inline.labels-filter
- = render "shared/issuable/label_dropdown", selected: finder.labels.select(:title).uniq, use_id: false, selected_toggle: params[:label_name], data_options: { field_name: "label_name[]" }
+ = render "shared/issuable/label_dropdown", selected: selected_labels, use_id: false, selected_toggle: params[:label_name], data_options: { field_name: "label_name[]" }
- if issuable_filter_present?
.filter-item.inline.reset-filters