Merge branch 'feature/custom-attributes-on-projects-and-groups' into 'master'

Support custom attributes on groups and projects

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

3 files changed, 11 insertions, 1 deletions

diff --git a/lib/api/groups.rb b/lib/api/groups.rb
index e817dcbbc4b..340a7cecf09 100644
--- a/lib/api/groups.rb
+++ b/lib/api/groups.rb
@@ -37,6 +37,8 @@ module API
     end
 
     resource :groups do
+      include CustomAttributesEndpoints
+
       desc 'Get a groups list' do
         success Entities::Group
       end
@@ -51,7 +53,12 @@ module API
         use :pagination
       end
       get do
-        find_params = { all_available: params[:all_available], owned: params[:owned] }
+        find_params = {
+          all_available: params[:all_available],
+          owned: params[:owned],
+          custom_attributes: params[:custom_attributes]
+        }
+
         groups = GroupsFinder.new(current_user, find_params).execute
         groups = groups.search(params[:search]) if params[:search].present?
         groups = groups.where.not(id: params[:skip_groups]) if params[:skip_groups].present?
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index 1c12166e434..5f9b94cc89c 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -328,6 +328,7 @@ module API
       finder_params[:archived] = params[:archived]
       finder_params[:search] = params[:search] if params[:search]
       finder_params[:user] = params.delete(:user) if params[:user]
+      finder_params[:custom_attributes] = params[:custom_attributes] if params[:custom_attributes]
       finder_params
     end
 
diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index aab7a6c3f93..4cd7e714aa2 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -119,6 +119,8 @@ module API
     end
 
     resource :projects do
+      include CustomAttributesEndpoints
+
       desc 'Get a list of visible projects for authenticated user' do
         success Entities::BasicProjectDetails
       end