Return only labels that user have access on IssuableFinder#labels

2 files changed, 7 insertions, 10 deletions

diff --git a/app/finders/issuable_finder.rb b/app/finders/issuable_finder.rb
index 41ea8f801c1..e27986ef95b 100644
--- a/app/finders/issuable_finder.rb
+++ b/app/finders/issuable_finder.rb
@@ -124,15 +124,12 @@ class IssuableFinder
   def labels
     return @labels if defined?(@labels)
 
-    if labels? && !filter_by_no_label?
-      @labels = Label.where(title: label_names)
-
-      if projects
-        @labels = LabelsFinder.new(current_user, project_ids: projects, title: label_names).execute
+    @labels =
+      if labels? && !filter_by_no_label?
+        LabelsFinder.new(current_user, project_ids: projects, title: label_names).execute
+      else
+        Label.none
       end
-    else
-      @labels = Label.none
-    end
   end
 
   def assignee?
diff --git a/app/finders/labels_finder.rb b/app/finders/labels_finder.rb
index 5ee2e1ee6e8..48fd1280ed2 100644
--- a/app/finders/labels_finder.rb
+++ b/app/finders/labels_finder.rb
@@ -45,7 +45,7 @@ class LabelsFinder < UnionFinder
     params[:project_id].presence
   end
 
-  def project_ids
+  def projects_ids
     params[:project_ids].presence
   end
 
@@ -70,7 +70,7 @@ class LabelsFinder < UnionFinder
 
     @projects = available_projects
     @projects = @projects.in_namespace(group_id) if group_id
-    @projects = @projects.where(id: project_ids) if project_ids
+    @projects = @projects.where(id: projects_ids) if projects_ids
     @projects = @projects.reorder(nil)
 
     @projects