Add latest changes from gitlab-org/gitlab@master

3 files changed, 0 insertions, 86 deletions

diff --git a/spec/services/git/base_hooks_service_spec.rb b/spec/services/git/base_hooks_service_spec.rb
index 874df9a68cd..6dc0353299b 100644
--- a/spec/services/git/base_hooks_service_spec.rb
+++ b/spec/services/git/base_hooks_service_spec.rb
@@ -85,78 +85,4 @@ describe Git::BaseHooksService do
       end
     end
   end
-
-  describe 'with remote mirrors' do
-    class TestService < described_class
-      def commits
-        []
-      end
-    end
-
-    let(:project) { create(:project, :repository, :remote_mirror) }
-
-    subject { TestService.new(project, user, oldrev: oldrev, newrev: newrev, ref: ref) }
-
-    before do
-      expect(subject).to receive(:execute_project_hooks)
-    end
-
-    context 'when remote mirror feature is enabled' do
-      it 'fails stuck remote mirrors' do
-        allow(project).to receive(:update_remote_mirrors).and_return(project.remote_mirrors)
-        expect(project).to receive(:mark_stuck_remote_mirrors_as_failed!)
-
-        subject.execute
-      end
-
-      it 'updates remote mirrors' do
-        expect(project).to receive(:update_remote_mirrors)
-
-        subject.execute
-      end
-    end
-
-    context 'when remote mirror feature is disabled' do
-      before do
-        stub_application_setting(mirror_available: false)
-      end
-
-      context 'with remote mirrors global setting overridden' do
-        before do
-          project.remote_mirror_available_overridden = true
-        end
-
-        it 'fails stuck remote mirrors' do
-          allow(project).to receive(:update_remote_mirrors).and_return(project.remote_mirrors)
-          expect(project).to receive(:mark_stuck_remote_mirrors_as_failed!)
-
-          subject.execute
-        end
-
-        it 'updates remote mirrors' do
-          expect(project).to receive(:update_remote_mirrors)
-
-          subject.execute
-        end
-      end
-
-      context 'without remote mirrors global setting overridden' do
-        before do
-          project.remote_mirror_available_overridden = false
-        end
-
-        it 'does not fails stuck remote mirrors' do
-          expect(project).not_to receive(:mark_stuck_remote_mirrors_as_failed!)
-
-          subject.execute
-        end
-
-        it 'does not updates remote mirrors' do
-          expect(project).not_to receive(:update_remote_mirrors)
-
-          subject.execute
-        end
-      end
-    end
-  end
 end
diff --git a/spec/services/git/branch_hooks_service_spec.rb b/spec/services/git/branch_hooks_service_spec.rb
index 2bf7dc32436..206b87fb889 100644
--- a/spec/services/git/branch_hooks_service_spec.rb
+++ b/spec/services/git/branch_hooks_service_spec.rb
@@ -19,12 +19,6 @@ describe Git::BranchHooksService do
     described_class.new(project, user, oldrev: oldrev, newrev: newrev, ref: ref)
   end
 
-  it 'update remote mirrors' do
-    expect(service).to receive(:update_remote_mirrors).and_call_original
-
-    service.execute
-  end
-
   describe "Git Push Data" do
     subject(:push_data) { service.send(:push_data) }
 
diff --git a/spec/services/git/tag_hooks_service_spec.rb b/spec/services/git/tag_hooks_service_spec.rb
index e362577d289..1b8e0675f1b 100644
--- a/spec/services/git/tag_hooks_service_spec.rb
+++ b/spec/services/git/tag_hooks_service_spec.rb
@@ -18,12 +18,6 @@ describe Git::TagHooksService, :service do
     described_class.new(project, user, oldrev: oldrev, newrev: newrev, ref: ref)
   end
 
-  it 'update remote mirrors' do
-    expect(service).to receive(:update_remote_mirrors).and_call_original
-
-    service.execute
-  end
-
   describe 'System hooks' do
     it 'Executes system hooks' do
       push_data = service.send(:push_data)