Merge branch 'make-checkbox-behaviour-clear' into '8-0-stable'

Make instructions for CI disable checkbox clear.

Fix confusion in https://gitlab.com/gitlab-org/gitlab-ce/issues/2663

See merge request !1431

app/views/admin/application_settings/_form.html.haml

@@ -131,7 +131,7 @@
         .checkbox
           = f.label :ci_enabled do
             = f.check_box :ci_enabled
-            Disable to prevent CI usage until rake ci:migrate is run (8.0 only)
+            When unchecked CI is disabled until rake ci:migrate is run (8.0 only)
   .form-actions
     = f.submit 'Save', class: 'btn btn-primary'

doc/migrate_ci_to_ce/README.md

@@ -116,8 +116,7 @@ https://about.gitlab.com/update/
 After you update, go to the admin panel and temporarily disable CI.  As
   an administrator, go to **Admin Area** -> **Settings**, and under
-**Continuous Integration** uncheck **Disable to prevent CI usage until rake
-ci:migrate is run (8.0 only)**.
+**Continuous Integration** uncheck **When unchecked CI is disabled until rake ci:migrate is run (8.0 only)**.
 #### 3. CI settings are now in GitLab
@@ -229,6 +228,8 @@ cd /home/git/gitlab
 sudo -u git -H bundle exec rake ci:migrate RAILS_ENV=production
 ```
+(this rake task automatically unchecks the 'When unchecked CI is disabled until rake ci:migrate is run (8.0 only)' checkbox)
+
 #### 6. Restart GitLab
 ```