3 files changed, 7 insertions, 3 deletions
diff --git a/app/services/projects/detect_repository_languages_service.rb b/app/services/projects/detect_repository_languages_service.rb
index d3680637217..942cd8162e4 100644
--- a/app/services/projects/detect_repository_languages_service.rb
+++ b/app/services/projects/detect_repository_languages_service.rb
@@ -12,7 +12,7 @@ module Projects
       matching_programming_languages = ensure_programming_languages(detection)
 
       RepositoryLanguage.transaction do
-        project.repository_languages.where(programming_language_id: detection.deletions).delete_all
+        RepositoryLanguage.where(project_id: project.id, programming_language_id: detection.deletions).delete_all
 
         detection.updates.each do |update|
           RepositoryLanguage
diff --git a/app/services/projects/move_access_service.rb b/app/services/projects/move_access_service.rb
index 8e2c3ad2f69..cddc544170f 100644
--- a/app/services/projects/move_access_service.rb
+++ b/app/services/projects/move_access_service.rb
@@ -20,6 +20,8 @@ module Projects
         ::Projects::MoveProjectAuthorizationsService.new(@project, @current_user)
           .execute(source_project, remove_remaining_elements: remove_remaining_elements)
 
+        @project.save(touch: false)
+
         success
       end
     end
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