diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-20 17:34:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-20 17:34:42 +0300 |
commit | 9f46488805e86b1bc341ea1620b866016c2ce5ed (patch) | |
tree | f9748c7e287041e37d6da49e0a29c9511dc34768 /app/models/remote_mirror.rb | |
parent | dfc92d081ea0332d69c8aca2f0e745cb48ae5e6d (diff) |
Add latest changes from gitlab-org/gitlab@13-0-stable-ee
Diffstat (limited to 'app/models/remote_mirror.rb')
-rw-r--r-- | app/models/remote_mirror.rb | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/app/models/remote_mirror.rb b/app/models/remote_mirror.rb index 0334d63dd36..8e7612e63c8 100644 --- a/app/models/remote_mirror.rb +++ b/app/models/remote_mirror.rb @@ -106,7 +106,23 @@ class RemoteMirror < ApplicationRecord update_status == 'started' end - def update_repository(options) + def update_repository + Gitlab::Git::RemoteMirror.new( + project.repository.raw, + remote_name, + **options_for_update + ).update + end + + def options_for_update + options = { + keep_divergent_refs: keep_divergent_refs? + } + + if only_protected_branches? + options[:only_branches_matching] = project.protected_branches.pluck(:name) + end + if ssh_mirror_url? if ssh_key_auth? && ssh_private_key.present? options[:ssh_key] = ssh_private_key @@ -117,13 +133,7 @@ class RemoteMirror < ApplicationRecord end end - options[:keep_divergent_refs] = keep_divergent_refs? - - Gitlab::Git::RemoteMirror.new( - project.repository.raw, - remote_name, - **options - ).update + options end def sync? |