Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
iv
gitlab-ce
Commits
4d287c8c
Commit
4d287c8c
authored
Sep 24, 2015
by
Sytse Sijbrandij
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make instructions for CI disable checkbox clear.
parent
834678f3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
app/views/admin/application_settings/_form.html.haml
app/views/admin/application_settings/_form.html.haml
+1
-1
doc/migrate_ci_to_ce/README.md
doc/migrate_ci_to_ce/README.md
+3
-2
No files found.
app/views/admin/application_settings/_form.html.haml
View file @
4d287c8c
...
@@ -131,7 +131,7 @@
...
@@ -131,7 +131,7 @@
.checkbox
.checkbox
=
f
.
label
:ci_enabled
do
=
f
.
label
:ci_enabled
do
=
f
.
check_box
:ci_enabled
=
f
.
check_box
:ci_enabled
Disable to prevent
CI usage until rake ci:migrate is run (8.0 only)
When checked disable
CI usage until rake ci:migrate is run (8.0 only)
.form-actions
.form-actions
=
f
.
submit
'Save'
,
class:
'btn btn-primary'
=
f
.
submit
'Save'
,
class:
'btn btn-primary'
doc/migrate_ci_to_ce/README.md
View file @
4d287c8c
...
@@ -116,8 +116,7 @@ https://about.gitlab.com/update/
...
@@ -116,8 +116,7 @@ https://about.gitlab.com/update/
After you update, go to the admin panel and temporarily disable CI. As
After you update, go to the admin panel and temporarily disable CI. As
an administrator, go to
**Admin Area**
->
**Settings**
, and under
an administrator, go to
**Admin Area**
->
**Settings**
, and under
**Continuous Integration**
uncheck
**
Disable to prevent CI usage until rake
**Continuous Integration**
uncheck
**When checked this disables CI usage until rake ci:migrate is run (8.0 only)**
.
ci:migrate is run (8.0 only)
**
.
#### 3. CI settings are now in GitLab
#### 3. CI settings are now in GitLab
...
@@ -229,6 +228,8 @@ cd /home/git/gitlab
...
@@ -229,6 +228,8 @@ cd /home/git/gitlab
sudo -u git -H bundle exec rake ci:migrate RAILS_ENV=production
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)
#### 6. Restart GitLab
#### 6. Restart GitLab
```
```
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment