Add latest changes from gitlab-org/gitlab@master

1 files changed, 1 insertions, 11 deletions

diff --git a/app/models/concerns/repository_storage_movable.rb b/app/models/concerns/repository_storage_movable.rb
index a45b4626628..e584922025a 100644
--- a/app/models/concerns/repository_storage_movable.rb
+++ b/app/models/concerns/repository_storage_movable.rb
@@ -20,7 +20,7 @@ module RepositoryStorageMovable
     validate :container_repository_writable, on: :create
 
     default_value_for(:destination_storage_name, allows_nil: false) do
-      pick_repository_storage
+      Repository.pick_storage_shard
     end
 
     state_machine initial: :initial do
@@ -82,16 +82,6 @@ module RepositoryStorageMovable
     end
   end
 
-  class_methods do
-    private
-
-    def pick_repository_storage
-      container_klass = reflect_on_association(:container).class_name.constantize
-
-      container_klass.pick_repository_storage
-    end
-  end
-
   # Projects, snippets, and group wikis has different db structure. In projects,
   # we need to update some columns in this step, but we don't with the other resources.
   #