1 files changed, 10 insertions, 7 deletions

diff --git a/lib/api/project_repository_storage_moves.rb b/lib/api/project_repository_storage_moves.rb
index ab5d8b3a888..5777b8754e7 100644
--- a/lib/api/project_repository_storage_moves.rb
+++ b/lib/api/project_repository_storage_moves.rb
@@ -11,7 +11,8 @@ module API
     resource :project_repository_storage_moves do
       desc 'Get a list of all project repository storage moves' do
         detail 'This feature was introduced in GitLab 13.0.'
-        success Entities::Projects::RepositoryStorageMove
+        is_array true
+        success code: 200, model: Entities::Projects::RepositoryStorageMove
       end
       params do
         use :pagination
@@ -24,7 +25,7 @@ module API
 
       desc 'Get a project repository storage move' do
         detail 'This feature was introduced in GitLab 13.0.'
-        success Entities::Projects::RepositoryStorageMove
+        success code: 200, model: Entities::Projects::RepositoryStorageMove
       end
       params do
         requires :repository_storage_move_id, type: Integer, desc: 'The ID of a project repository storage move'
@@ -37,6 +38,7 @@ module API
 
       desc 'Schedule bulk project repository storage moves' do
         detail 'This feature was introduced in GitLab 13.7.'
+        success code: 202
       end
       params do
         requires :source_storage_name, type: String, desc: 'The source storage shard', values: -> { Gitlab.config.repositories.storages.keys }
@@ -53,12 +55,13 @@ module API
     end
 
     params do
-      requires :id, type: String, desc: 'The ID of a project'
+      requires :id, types: [String, Integer], desc: 'The ID or URL-encoded path of the project'
     end
     resource :projects, requirements: API::NAMESPACE_OR_PROJECT_REQUIREMENTS do
       desc 'Get a list of all project repository storage moves' do
         detail 'This feature was introduced in GitLab 13.1.'
-        success Entities::Projects::RepositoryStorageMove
+        is_array true
+        success code: 200, model: Entities::Projects::RepositoryStorageMove
       end
       params do
         use :pagination
@@ -71,7 +74,7 @@ module API
 
       desc 'Get a project repository storage move' do
         detail 'This feature was introduced in GitLab 13.1.'
-        success Entities::Projects::RepositoryStorageMove
+        success code: 200, model: Entities::Projects::RepositoryStorageMove
       end
       params do
         requires :repository_storage_move_id, type: Integer, desc: 'The ID of a project repository storage move'
@@ -84,14 +87,14 @@ module API
 
       desc 'Schedule a project repository storage move' do
         detail 'This feature was introduced in GitLab 13.1.'
-        success Entities::Projects::RepositoryStorageMove
+        success code: 201, model: Entities::Projects::RepositoryStorageMove
       end
       params do
         optional :destination_storage_name, type: String, desc: 'The destination storage shard'
       end
       post ':id/repository_storage_moves' do
         storage_move = user_project.repository_storage_moves.build(
-          declared_params.merge(source_storage_name: user_project.repository_storage)
+          declared_params.compact.merge(source_storage_name: user_project.repository_storage)
         )
 
         if storage_move.schedule