Merge branch 'master' into 8-12-stable-ee

CHANGELOG-EE

@@ -8,6 +8,7 @@ v 8.12.0 (Unreleased)
   - [ES] Fix: Elasticsearch does not find partial matches in project names
   - [ES] Global code search
   - [ES] Improve logging
+  - Fix projects with remote mirrors asynchronously destruction
 
 v 8.11.6
   - Exclude blocked users from potential MR approvers.

app/models/remote_mirror.rb

@@ -158,8 +158,10 @@ class RemoteMirror < ActiveRecord::Base
   end
 
   def remove_remote
+    if project # could be pending to delete so don't need to touch the git repository
       project.repository.remove_remote(ref_name)
     end
+  end
 
   def mirror_url_changed?
     url_changed? || encrypted_credentials_changed?

spec/services/projects/destroy_service_spec.rb

@@ -5,6 +5,7 @@ describe Projects::DestroyService, services: true do
   let!(:project) { create(:project, namespace: user.namespace) }
   let!(:path) { project.repository.path_to_repo }
   let!(:remove_path) { path.sub(/\.git\Z/, "+#{project.id}+deleted.git") }
+  let!(:async) { false } # execute or async_execute
 
   context 'Sidekiq inline' do
     before do
@@ -15,6 +16,19 @@ describe Projects::DestroyService, services: true do
     it { expect(Project.all).not_to include(project) }
     it { expect(Dir.exist?(path)).to be_falsey }
     it { expect(Dir.exist?(remove_path)).to be_falsey }
+
+    context 'when has remote mirrors' do
+      let!(:project) do
+        create(:project, namespace: user.namespace).tap do |project|
+          project.remote_mirrors.create(url: 'http://test.com')
+        end
+      end
+      let!(:async) { true }
+
+      it 'destroys them' do
+        expect(RemoteMirror.count).to eq(0)
+      end
+    end
   end
 
   context 'Sidekiq fake' do
@@ -52,6 +66,10 @@ describe Projects::DestroyService, services: true do
   end
 
   def destroy_project(project, user, params)
+    if async
+      Projects::DestroyService.new(project, user, params).async_execute
+    else
       Projects::DestroyService.new(project, user, params).execute
     end
+  end
 end