diff options
| author | Marin Jankovski <marin@gitlab.com> | 2015-09-21 11:26:06 +0300 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2015-09-21 11:26:06 +0300 |
| commit | d2c90d7494e8ca6b37d4ce57b2bc08f8b1175c4b (patch) | |
| tree | e306615f160bc37e9d17ea73e1a855fe4cd5c10d /app | |
| parent | 8bb3215d543db5a7905c1322cf584276a4f58145 (diff) | |
| parent | a37e591e7414f51ca9076e966c724030225528db (diff) | |
Merge branch 'optimize-ci-tags-migration' into 'master'
CI migration rake task for GitLab CE
- Uses backup format for final GitLab CI 8.0
- Highly optimized tags migration SQL queries
See merge request !1365
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/admin/application_settings/_form.html.haml | 2 | ||||
| -rw-r--r-- | app/views/ci/projects/disabled.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml index 1476e29524c..143cd10c543 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 - Enable Continuous Integration + Disable to prevent CI usage until rake ci:migrate is run (8.0 only) .form-actions = f.submit 'Save', class: 'btn btn-primary' diff --git a/app/views/ci/projects/disabled.html.haml b/app/views/ci/projects/disabled.html.haml index 95276d894ed..83b0d8329e1 100644 --- a/app/views/ci/projects/disabled.html.haml +++ b/app/views/ci/projects/disabled.html.haml @@ -1 +1 @@ -Continuous Integration has been disabled. Please ask your administrator to enable it. +Continuous Integration has been disabled for time of the migration. |