diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-30 15:07:51 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-30 15:07:51 +0000 |
| commit | 4e9acbfba3682c552b3de707c535e6257ef41054 (patch) | |
| tree | 8b1fd5f89ad3f1be68d8944815b13bb7d498e4a6 /app/views/projects/mirrors | |
| parent | 506d6dcd7c787ba71a8a53102f3d4fdb6adcfa5e (diff) | |
| download | gitlab-ce-4e9acbfba3682c552b3de707c535e6257ef41054.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/mirrors')
| -rw-r--r-- | app/views/projects/mirrors/_mirror_repos_push.html.haml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/app/views/projects/mirrors/_mirror_repos_push.html.haml b/app/views/projects/mirrors/_mirror_repos_push.html.haml index b7c885b4a63..8482424a184 100644 --- a/app/views/projects/mirrors/_mirror_repos_push.html.haml +++ b/app/views/projects/mirrors/_mirror_repos_push.html.haml @@ -1,8 +1,15 @@ - protocols = Gitlab::UrlSanitizer::ALLOWED_SCHEMES.join('|') +- keep_divergent_refs = Feature.enabled?(:keep_divergent_refs, @project) = f.fields_for :remote_mirrors, @project.remote_mirrors.build do |rm_f| = rm_f.hidden_field :enabled, value: '1' = rm_f.hidden_field :url, class: 'js-mirror-url-hidden', required: true, pattern: "(#{protocols}):\/\/.+" = rm_f.hidden_field :only_protected_branches, class: 'js-mirror-protected-hidden' + - if keep_divergent_refs + = rm_f.hidden_field :keep_divergent_refs, class: 'js-mirror-keep-divergent-refs-hidden' = render partial: 'projects/mirrors/ssh_host_keys', locals: { f: rm_f } = render partial: 'projects/mirrors/authentication_method', locals: { f: rm_f } + - if keep_divergent_refs + .form-check.append-bottom-10 + = check_box_tag :keep_divergent_refs, '1', false, class: 'js-mirror-keep-divergent-refs form-check-input' + = label_tag :keep_divergent_refs, 'Keep divergent refs', class: 'form-check-label' |