diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-06-06 05:11:16 -0500 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-06-06 05:11:16 -0500 |
| commit | e2ff570f275da36eddc77b6ee60d075df10dbfc1 (patch) | |
| tree | ba56caf67f487d87e8832cc04981ab81780dc5aa | |
| parent | 7830d406be6c9935e8a4c8a863ef1282163b6b19 (diff) | |
| download | gitlab-ce-e2ff570f275da36eddc77b6ee60d075df10dbfc1.tar.gz | |
add help links to the deployment strategy options
| -rw-r--r-- | app/views/projects/settings/ci_cd/_autodevops_form.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/settings/ci_cd/show.html.haml | 4 |
2 files changed, 4 insertions, 2 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 037c976f57a..c4677715104 100644 --- a/app/views/projects/settings/ci_cd/_autodevops_form.html.haml +++ b/app/views/projects/settings/ci_cd/_autodevops_form.html.haml @@ -47,10 +47,12 @@ = form.radio_button :deploy_strategy, 'continuous', class: 'form-check-input' = form.label :deploy_strategy_continuous, class: 'form-check-label' do %strong= s_('CICD|Continuous deployment to production') + = link_to icon('question-circle'), help_page_path('topics/autodevops/index.md', anchor: 'auto-deploy'), target: '_blank' .form-check = form.radio_button :deploy_strategy, 'manual', class: 'form-check-input' = form.label :deploy_strategy_manual, class: 'form-check-label' do %strong= s_('CICD|Automatic deployment to staging, manual deployment to production') + = link_to icon('question-circle'), help_page_path('ci/environments.md', anchor: 'manually-deploying-to-environments'), target: '_blank' .card .card-body diff --git a/app/views/projects/settings/ci_cd/show.html.haml b/app/views/projects/settings/ci_cd/show.html.haml index ed17bd4f7dc..0b52cf6a4b4 100644 --- a/app/views/projects/settings/ci_cd/show.html.haml +++ b/app/views/projects/settings/ci_cd/show.html.haml @@ -16,12 +16,12 @@ .settings-content = render 'form' -%section.settings#autodevops-settings.no-animate{ class: ('expanded' if expanded) } +%section.settings#autodevops-settings.no-animate{ class: ('expanded' if true) } .settings-header %h4 = s_('CICD|Auto DevOps') %button.btn.btn-default.js-settings-toggle{ type: 'button' } - = expanded ? _('Collapse') : _('Expand') + = true ? _('Collapse') : _('Expand') %p = s_('CICD|Auto DevOps will automatically build, test, and deploy your application based on a predefined Continuous Integration and Delivery configuration.') = link_to s_('CICD|Learn more about Auto DevOps'), help_page_path('topics/autodevops/index.md') |