summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-12-11 20:50:07 +0000
committerRobert Speicher <robert@gitlab.com>2017-12-11 20:50:07 +0000
commit6930fa3102f0ba197e969f9996e86bf11346470c (patch)
tree4659da4c4cab1e2a65d5763bc6a32f0075649553 /app/models
parent9c6ce2e8c93dc8d75d00b67ec5628f542826e5b8 (diff)
parent95009cefc2fe237cde72c93a0634e5dbc638cd1a (diff)
downloadgitlab-ce-6930fa3102f0ba197e969f9996e86bf11346470c.tar.gz
Merge branch 'gitaly-mirroring-prep' into 'master'
Gitaly mirroring migration prep Closes gitaly#816 See merge request gitlab-org/gitlab-ce!15775
Diffstat (limited to 'app/models')
-rw-r--r--app/models/repository.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 751306188a0..d1ae3304e4a 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -971,8 +971,7 @@ class Repository
tmp_remote_name = true
end
- add_remote(remote_name, url)
- set_remote_as_mirror(remote_name, refmap: refmap)
+ add_remote(remote_name, url, mirror_refmap: refmap)
fetch_remote(remote_name, forced: forced)
ensure
remove_remote(remote_name) if tmp_remote_name