Merge branch 'dz-refactor-group-labels-finder' into 'master'

Fix group labels page timeout if many projects and labels

Closes #51221

See merge request gitlab-org/gitlab-ce!21594

2 files changed, 5 insertions, 3 deletions

diff --git a/app/controllers/groups/labels_controller.rb b/app/controllers/groups/labels_controller.rb
index 3e0076ac935..e95123c0933 100644
--- a/app/controllers/groups/labels_controller.rb
+++ b/app/controllers/groups/labels_controller.rb
@@ -2,7 +2,6 @@ class Groups::LabelsController < Groups::ApplicationController
   include ToggleSubscriptionAction
 
   before_action :label, only: [:edit, :update, :destroy]
-  before_action :available_labels, only: [:index]
   before_action :authorize_admin_labels!, only: [:new, :create, :edit, :update, :destroy]
   before_action :save_previous_label_path, only: [:edit]
 
@@ -11,10 +10,12 @@ class Groups::LabelsController < Groups::ApplicationController
   def index
     respond_to do |format|
       format.html do
-        @labels = @available_labels.page(params[:page])
+        @labels = @group.labels
+          .optionally_search(params[:search])
+          .page(params[:page])
       end
       format.json do
-        render json: LabelSerializer.new.represent_appearance(@available_labels)
+        render json: LabelSerializer.new.represent_appearance(available_labels)
       end
     end
   end
diff --git a/app/models/label.rb b/app/models/label.rb
index 96c1515b41a..8db7c3abd10 100644
--- a/app/models/label.rb
+++ b/app/models/label.rb
@@ -5,6 +5,7 @@ class Label < ActiveRecord::Base
   include Referable
   include Subscribable
   include Gitlab::SQL::Pattern
+  include OptionallySearch
 
   # Represents a "No Label" state used for filtering Issues and Merge
   # Requests that have no label assigned.