diff options
author | Mike Greiling <mike@pixelcog.com> | 2018-06-06 03:42:12 -0500 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2018-06-06 03:42:12 -0500 |
commit | 64854ae395818c81b357d43fe076af7b81a3bb19 (patch) | |
tree | bdc86c463555e87a8ff15344093231e1f19274af /app/views/projects/settings/ci_cd | |
parent | 5403a4a07ed86770f1ab11108ab5a86fa2b90e54 (diff) | |
download | gitlab-ce-64854ae395818c81b357d43fe076af7b81a3bb19.tar.gz |
re-order autodevops options
Diffstat (limited to 'app/views/projects/settings/ci_cd')
-rw-r--r-- | app/views/projects/settings/ci_cd/_autodevops_form.html.haml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/app/views/projects/settings/ci_cd/_autodevops_form.html.haml b/app/views/projects/settings/ci_cd/_autodevops_form.html.haml index bbabb98dafe..f2e42848c11 100644 --- a/app/views/projects/settings/ci_cd/_autodevops_form.html.haml +++ b/app/views/projects/settings/ci_cd/_autodevops_form.html.haml @@ -18,19 +18,19 @@ = s_('CICD|The Auto DevOps pipeline configuration will be used when there is no %{ci_file} in the project.').html_safe % { ci_file: ci_file_formatted } .form-check - = form.radio_button :enabled, 'false', class: 'form-check-input' - = form.label :enabled_false, class: 'form-check-label' do - %strong= s_('CICD|Disable Auto DevOps') - %br - = s_('CICD|An explicit %{ci_file} needs to be specified before you can begin using Continuous Integration and Delivery.').html_safe % { ci_file: ci_file_formatted } - - .form-check = form.radio_button :enabled, '', class: 'form-check-input' = form.label :enabled_, class: 'form-check-label' do %strong= s_('CICD|Instance default (%{state})') % { state: "#{Gitlab::CurrentSettings.auto_devops_enabled? ? _('enabled') : _('disabled')}" } %br = s_('CICD|Follow the instance default to either have Auto DevOps enabled or disabled when there is no project specific %{ci_file}.').html_safe % { ci_file: ci_file_formatted } + .form-check + = form.radio_button :enabled, 'false', class: 'form-check-input' + = form.label :enabled_false, class: 'form-check-label' do + %strong= s_('CICD|Disable Auto DevOps') + %br + = s_('CICD|An explicit %{ci_file} needs to be specified before you can begin using Continuous Integration and Delivery.').html_safe % { ci_file: ci_file_formatted } + = form.label :domain, class:"prepend-top-10" do = _('Domain') = form.text_field :domain, class: 'form-control', placeholder: 'domain.com' |