Merge branch 'dz-group-labels-search' into 'master'

Add search to group labels page

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

1 files changed, 3 insertions, 3 deletions

diff --git a/app/controllers/groups/labels_controller.rb b/app/controllers/groups/labels_controller.rb
index 863f50e8e66..3e0076ac935 100644
--- a/app/controllers/groups/labels_controller.rb
+++ b/app/controllers/groups/labels_controller.rb
@@ -11,7 +11,7 @@ class Groups::LabelsController < Groups::ApplicationController
   def index
     respond_to do |format|
       format.html do
-        @labels = @group.labels.page(params[:page])
+        @labels = @available_labels.page(params[:page])
       end
       format.json do
         render json: LabelSerializer.new.represent_appearance(@available_labels)
@@ -113,7 +113,7 @@ class Groups::LabelsController < Groups::ApplicationController
         group_id: @group.id,
         only_group_labels: params[:only_group_labels],
         include_ancestor_groups: params[:include_ancestor_groups],
-        include_descendant_groups: params[:include_descendant_groups]
-      ).execute
+        include_descendant_groups: params[:include_descendant_groups],
+        search: params[:search]).execute
   end
 end