Commit afe6d9af authored by Phil Hughes's avatar Phil Hughes

Merge branch...

Merge branch '344343-make-badges-in-app-views-projects-settings-ci_cd-_autodevops_form-html-haml-pajamas-compliant' into 'master'

Migrate auto-devops setting to GlBadge abstraction

See merge request gitlab-org/gitlab!76416
parents 0276ad1a aeab12c9
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
= form.label :enabled, class: 'form-check-label' do = form.label :enabled, class: 'form-check-label' do
%strong= s_('CICD|Default to Auto DevOps pipeline') %strong= s_('CICD|Default to Auto DevOps pipeline')
- if auto_devops_enabled - if auto_devops_enabled
%span.badge.badge-info.js-instance-default-badge= badge_for_auto_devops_scope(@project) = gl_badge_tag badge_for_auto_devops_scope(@project), { variant: :info }, { class: 'js-instance-default-badge'}
.form-text.text-muted .form-text.text-muted
= s_('CICD|The Auto DevOps pipeline runs if no alternative CI configuration file is found.') = s_('CICD|The Auto DevOps pipeline runs if no alternative CI configuration file is found.')
= link_to _('Learn more.'), help_page_path('topics/autodevops/index.md'), target: '_blank' = link_to _('Learn more.'), help_page_path('topics/autodevops/index.md'), target: '_blank'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment