summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2015-09-21 00:16:51 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2015-09-21 00:42:25 +0200
commitb2a90216858160840fdfbe7a221c317a6c073f22 (patch)
tree580b78979eebffce4aabd6acd918e3e19937a1c6 /app
parent098c1982713f3a4075efd6f27ab6326c75fc20ea (diff)
downloadgitlab-ce-b2a90216858160840fdfbe7a221c317a6c073f22.tar.gz
Diffstat (limited to 'app')
-rw-r--r--app/views/admin/application_settings/_form.html.haml2
-rw-r--r--app/views/ci/projects/disabled.html.haml2
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.