diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-08-24 08:40:02 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-08-24 08:40:02 +0000 |
| commit | 85b59a1739675dc06f6e89066a8ca83298fbb320 (patch) | |
| tree | 4a4613d08a7dd8f4fdab217cb7f8fc193de4b8f3 /spec/services | |
| parent | 842377ab3c5b80a3758ad8c36dc3358bd265bc10 (diff) | |
| parent | 578137f6e4817591e98019bf3e88065fae0a2879 (diff) | |
| download | gitlab-ce-85b59a1739675dc06f6e89066a8ca83298fbb320.tar.gz | |
Merge branch 'sh-fix-issue-50562' into 'master'
Fix remote mirrors failing if Git remotes have not been added
Closes #50562
See merge request gitlab-org/gitlab-ce!21351
Diffstat (limited to 'spec/services')
| -rw-r--r-- | spec/services/projects/update_remote_mirror_service_spec.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/services/projects/update_remote_mirror_service_spec.rb b/spec/services/projects/update_remote_mirror_service_spec.rb index 5c2e79ff9af..96e8a80b334 100644 --- a/spec/services/projects/update_remote_mirror_service_spec.rb +++ b/spec/services/projects/update_remote_mirror_service_spec.rb @@ -18,6 +18,7 @@ describe Projects::UpdateRemoteMirrorService do end it "fetches the remote repository" do + expect(remote_mirror).to receive(:ensure_remote!).and_call_original expect(repository).to receive(:fetch_remote).with(remote_mirror.remote_name, no_tags: true) do sync_remote(repository, remote_mirror.remote_name, local_branch_names) end |