diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml index 143cd10c543862907b8287404b15d5e46558aa08..d1bcc731907d4524bff58e0517f4a2411859a5e0 100644 --- a/app/views/admin/application_settings/_form.html.haml +++ b/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' diff --git a/doc/migrate_ci_to_ce/README.md b/doc/migrate_ci_to_ce/README.md index 2725bf343eee5dea5a94d1e5e1eeb9e877c821e8..0970b100c8cb05a42fa3c4c1bc492238e8ee20e9 100644 --- a/doc/migrate_ci_to_ce/README.md +++ b/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 ```