diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-02 18:08:01 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-02 18:08:01 +0300 |
| commit | 53b1f4eaa2a451aaba908a5fee7ce97a930021ac (patch) | |
| tree | 66501ec0de9f529ee1cfc7cd6c4b481b1fc76662 /app/models/remote_mirror.rb | |
| parent | 684d65316ac77c62f47d68b9926eea8af30db227 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/remote_mirror.rb')
| -rw-r--r-- | app/models/remote_mirror.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/remote_mirror.rb b/app/models/remote_mirror.rb index 1e5c93cd913..0334d63dd36 100644 --- a/app/models/remote_mirror.rb +++ b/app/models/remote_mirror.rb @@ -117,6 +117,8 @@ class RemoteMirror < ApplicationRecord end end + options[:keep_divergent_refs] = keep_divergent_refs? + Gitlab::Git::RemoteMirror.new( project.repository.raw, remote_name, |