Merge branch '38155-autodevops-typo' into 'master'

Fix auto devops typos in Pipeline Settings view Closes #38155 See merge request gitlab-org/gitlab-ce!14403

Merge branch '38155-autodevops-typo' into 'master'
9cb9331e · Achilleas Pipinellis · b83dcd3a · 093e708b · 9cb9331e
Commit 9cb9331e authored Sep 25, 2017 by Achilleas Pipinellis
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

_show.html.haml app/views/projects/pipelines_settings/_show.html.haml +2 -1

No files found.
--- a/app/views/projects/pipelines_settings/_show.html.haml
+++ b/app/views/projects/pipelines_settings/_show.html.haml
@@ -26,7 +26,8 @@
                %strong Disable Auto DevOps
                %br
                %span.descr
-                  An explicit <code>.gitlab-ci.yml</code> needs to be specified before you can begin using Continious Integration and Delivery.
+                  An explicit <code>.gitlab-ci.yml</code> needs to be specified before you can begin using Continuous Integration and Delivery.
+
            .radio
              = form.label :enabled_nil do
                = form.radio_button :enabled, ''