diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-09-25 03:12:52 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2015-09-25 03:12:52 +0300 |
| commit | 3df6c44eae8f77272de07ed97ad6c2905787a702 (patch) | |
| tree | dda7b91fb4900357223047464d8ea11a324582d1 | |
| parent | 834678f39b65b9438af122be33a99413090f756f (diff) | |
| parent | 41bb994836b1184dc8996a3c200501a4d00c0c54 (diff) | |
Merge branch 'make-checkbox-behaviour-clear' into '8-0-stable'
v8.0.2
Make instructions for CI disable checkbox clear.
Fix confusion in https://gitlab.com/gitlab-org/gitlab-ce/issues/2663
See merge request !1431
| -rw-r--r-- | app/views/admin/application_settings/_form.html.haml | 2 | ||||
| -rw-r--r-- | doc/migrate_ci_to_ce/README.md | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml index 143cd10c543..d1bcc731907 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 2725bf343ee..0970b100c8c 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 ``` |