Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42

1 files changed, 18 insertions, 0 deletions

diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index 6ed480518ee..8c58cc585d8 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -453,6 +453,8 @@ module API
         filter_attributes_using_license!(attrs)
         verify_update_project_attrs!(user_project, attrs)
 
+        user_project.remove_avatar! if attrs.key?(:avatar) && attrs[:avatar].nil?
+
         result = ::Projects::UpdateService.new(user_project, current_user, attrs).execute
 
         if result[:status] == :success
@@ -743,6 +745,22 @@ module API
         end
       end
 
+      desc 'Get the namespaces to where the project can be transferred'
+      params do
+        optional :search, type: String, desc: 'Return list of namespaces matching the search criteria'
+        use :pagination
+      end
+      get ":id/transfer_locations", feature_category: :projects do
+        authorize! :change_namespace, user_project
+        args = declared_params(include_missing: false)
+        args[:permission_scope] = :transfer_projects
+
+        groups = ::Groups::UserGroupsFinder.new(current_user, current_user, args).execute
+        groups = groups.with_route
+
+        present_groups(groups)
+      end
+
       desc 'Show the storage information' do
         success Entities::ProjectRepositoryStorage
       end