Add latest changes from gitlab-org/gitlab@master

1 files changed, 2 insertions, 2 deletions

diff --git a/spec/models/remote_mirror_spec.rb b/spec/models/remote_mirror_spec.rb
index 356b0e18559..a87cdcf9344 100644
--- a/spec/models/remote_mirror_spec.rb
+++ b/spec/models/remote_mirror_spec.rb
@@ -147,13 +147,13 @@ describe RemoteMirror, :mailer do
       git_remote_mirror = stub_const('Gitlab::Git::RemoteMirror', spy)
       mirror = build(:remote_mirror)
 
-      expect(mirror).to receive(:options_for_update).and_return(options: true)
+      expect(mirror).to receive(:options_for_update).and_return(keep_divergent_refs: true)
       mirror.update_repository
 
       expect(git_remote_mirror).to have_received(:new).with(
         mirror.project.repository.raw,
         mirror.remote_name,
-        options: true
+        keep_divergent_refs: true
       )
       expect(git_remote_mirror).to have_received(:update)
     end