Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-09-20 23:07:56 +0300
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-10-19 19:58:24 +0300
commitcfedd42badc6b84457d1de35cb31988777462d5a (patch)
treeca0588b33e11d2f28104b320dcec6884ac148ec8 /app/finders
parente2dd75c0a2d863c8e530e54f3a0a015bdec1e84f (diff)
Add ProjectLabel model
Diffstat (limited to 'app/finders')
-rw-r--r--app/finders/issuable_finder.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/finders/issuable_finder.rb b/app/finders/issuable_finder.rb
index 37151f8d134..6f2adf47c3a 100644
--- a/app/finders/issuable_finder.rb
+++ b/app/finders/issuable_finder.rb
@@ -128,7 +128,8 @@ class IssuableFinder
@labels = Label.where(title: label_names)
if projects
- @labels = @labels.where(project: projects)
+ label_ids = LabelsFinder.new(current_user, project_id: projects).execute.select(:id)
+ @labels = @labels.where(labels: { id: label_ids })
end
else
@labels = Label.none