Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42

1 files changed, 10 insertions, 0 deletions

diff --git a/app/models/project_repository_storage_move.rb b/app/models/project_repository_storage_move.rb
index 2b74d9ccd88..76f428fe925 100644
--- a/app/models/project_repository_storage_move.rb
+++ b/app/models/project_repository_storage_move.rb
@@ -20,6 +20,10 @@ class ProjectRepositoryStorageMove < ApplicationRecord
     inclusion: { in: ->(_) { Gitlab.config.repositories.storages.keys } }
   validate :project_repository_writable, on: :create
 
+  default_value_for(:destination_storage_name, allows_nil: false) do
+    pick_repository_storage
+  end
+
   state_machine initial: :initial do
     event :schedule do
       transition initial: :scheduled
@@ -77,6 +81,12 @@ class ProjectRepositoryStorageMove < ApplicationRecord
   scope :order_created_at_desc, -> { order(created_at: :desc) }
   scope :with_projects, -> { includes(project: :route) }
 
+  class << self
+    def pick_repository_storage
+      Project.pick_repository_storage
+    end
+  end
+
   private
 
   def project_repository_writable