Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 2 deletions

diff --git a/lib/api/labels.rb b/lib/api/labels.rb
index 0cc9f33bd07..c9a75583cee 100644
--- a/lib/api/labels.rb
+++ b/lib/api/labels.rb
@@ -19,10 +19,12 @@ module API
                  desc: 'Include issue and merge request counts'
         optional :include_ancestor_groups, type: Boolean, default: true,
                  desc: 'Include ancestor groups'
+        optional :search, type: String,
+                 desc: 'Keyword to filter labels by. This feature was added in GitLab 13.6'
         use :pagination
       end
       get ':id/labels' do
-        get_labels(user_project, Entities::ProjectLabel, include_ancestor_groups: params[:include_ancestor_groups])
+        get_labels(user_project, Entities::ProjectLabel, declared_params)
       end
 
       desc 'Get a single label' do
@@ -34,7 +36,7 @@ module API
                  desc: 'Include ancestor groups'
       end
       get ':id/labels/:name' do
-        get_label(user_project, Entities::ProjectLabel, include_ancestor_groups: params[:include_ancestor_groups])
+        get_label(user_project, Entities::ProjectLabel, declared_params)
       end
 
       desc 'Create a new label' do