diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2018-09-03 19:00:28 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2018-09-03 19:00:28 +0300 |
commit | 400cc09f72eb4aca4900d154ab3c02594e870834 (patch) | |
tree | d26fd7c56161021fe4ddfa17aeaf75d043ddec22 /app/controllers/groups | |
parent | 48541cacc050b931d884ba828d0901232308b4c4 (diff) | |
download | gitlab-ce-400cc09f72eb4aca4900d154ab3c02594e870834.tar.gz |
Add search to group labels page [ci skip]
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/controllers/groups')
-rw-r--r-- | app/controllers/groups/labels_controller.rb | 6 |
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 |