diff options
| author | Sytse Sijbrandij <sytse@gitlab.com> | 2015-09-24 16:07:22 -0700 |
|---|---|---|
| committer | Sytse Sijbrandij <sytse@gitlab.com> | 2015-09-24 16:07:22 -0700 |
| commit | 41bb994836b1184dc8996a3c200501a4d00c0c54 (patch) | |
| tree | dda7b91fb4900357223047464d8ea11a324582d1 | |
| parent | 4d287c8c15ec23d0790799541b16885f5ed6cf23 (diff) | |
| download | gitlab-ce-41bb994836b1184dc8996a3c200501a4d00c0c54.tar.gz | |
I misunderstood how the button worked.
| -rw-r--r-- | app/views/admin/application_settings/_form.html.haml | 2 | ||||
| -rw-r--r-- | doc/migrate_ci_to_ce/README.md | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml index 9037aaf2cc0..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 - When checked disable 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 bb56ab6a887..0970b100c8c 100644 --- a/doc/migrate_ci_to_ce/README.md +++ b/doc/migrate_ci_to_ce/README.md @@ -116,7 +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 **When checked this disables 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 @@ -228,7 +228,7 @@ cd /home/git/gitlab sudo -u git -H bundle exec rake ci:migrate RAILS_ENV=production ``` -(this rake task automatically unchecks the 'When checked this disables CI usage until rake ci:migrate is run (8.0 only)' checkbox) +(this rake task automatically unchecks the 'When unchecked CI is disabled until rake ci:migrate is run (8.0 only)' checkbox) #### 6. Restart GitLab |