Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 2 deletions

diff --git a/app/services/projects/transfer_service.rb b/app/services/projects/transfer_service.rb
index 718416a03d4..309eab59463 100644
--- a/app/services/projects/transfer_service.rb
+++ b/app/services/projects/transfer_service.rb
@@ -13,8 +13,6 @@ module Projects
     include Gitlab::ShellAdapter
     TransferError = Class.new(StandardError)
 
-    attr_reader :new_namespace
-
     def execute(new_namespace)
       @new_namespace = new_namespace
 
@@ -39,6 +37,8 @@ module Projects
 
     private
 
+    attr_reader :old_path, :new_path, :new_namespace
+
     # rubocop: disable CodeReuse/ActiveRecord
     def transfer(project)
       @old_path = project.full_path
@@ -132,6 +132,8 @@ module Projects
     end
 
     def rollback_folder_move
+      return if project.hashed_storage?(:repository)
+
       move_repo_folder(@new_path, @old_path)
       move_repo_folder("#{@new_path}.wiki", "#{@old_path}.wiki")
     end