diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-09-29 15:50:14 -0300 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-10-19 14:58:25 -0200 |
| commit | 3db2261005c438faad8bf4a339d46eb7798f05b5 (patch) | |
| tree | b09acae73956cf67ed160a3ae2c4139a9140921a /app/finders/issuable_finder.rb | |
| parent | 723e576782aefa339a4db8916908c7ebe5a92f48 (diff) | |
| download | gitlab-ce-3db2261005c438faad8bf4a339d46eb7798f05b5.tar.gz | |
Reuse LabelsFinder on Banzai::Filter::LabelReferenceFilter
Diffstat (limited to 'app/finders/issuable_finder.rb')
| -rw-r--r-- | app/finders/issuable_finder.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/finders/issuable_finder.rb b/app/finders/issuable_finder.rb index 6f2adf47c3a..41ea8f801c1 100644 --- a/app/finders/issuable_finder.rb +++ b/app/finders/issuable_finder.rb @@ -128,8 +128,7 @@ class IssuableFinder @labels = Label.where(title: label_names) if projects - label_ids = LabelsFinder.new(current_user, project_id: projects).execute.select(:id) - @labels = @labels.where(labels: { id: label_ids }) + @labels = LabelsFinder.new(current_user, project_ids: projects, title: label_names).execute end else @labels = Label.none @@ -277,7 +276,7 @@ class IssuableFinder items = items.with_label(label_names, params[:sort]) if projects - label_ids = LabelsFinder.new(current_user, project_id: projects).execute.select(:id) + label_ids = LabelsFinder.new(current_user, project_ids: projects).execute.select(:id) items = items.where(labels: { id: label_ids }) end end |