summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2017-09-25 19:56:50 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2017-09-25 19:56:50 +0000
commit9cb9331ec58b8177b0ad965b1c794092a6e61362 (patch)
tree8e8f70ca8c79c48585e04803e1567d9d75c3f355
parentb83dcd3a30539f86b13d91ffd24fb708652eae80 (diff)
parent093e708bf8157052eb204577da3bac38b7c4e6b5 (diff)
downloadgitlab-ce-9cb9331ec58b8177b0ad965b1c794092a6e61362.tar.gz
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
-rw-r--r--app/views/projects/pipelines_settings/_show.html.haml3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/views/projects/pipelines_settings/_show.html.haml b/app/views/projects/pipelines_settings/_show.html.haml
index 21d01242c0e..77211099830 100644
--- 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, ''