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
Boxiang Sun
gitlab-ce
Commits
7e51cd32
Commit
7e51cd32
authored
Jan 27, 2017
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update scripts and docs to reference the newly namespaced rake task
parent
336d780d
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
11 additions
and
11 deletions
+11
-11
.gitlab-ci.yml
.gitlab-ci.yml
+1
-1
app/models/application_setting.rb
app/models/application_setting.rb
+1
-1
doc/administration/raketasks/maintenance.md
doc/administration/raketasks/maintenance.md
+2
-2
doc/api/commits.md
doc/api/commits.md
+1
-1
doc/install/installation.md
doc/install/installation.md
+1
-1
doc/install/relative_url.md
doc/install/relative_url.md
+1
-1
doc/update/patch_versions.md
doc/update/patch_versions.md
+1
-1
lib/gitlab/upgrader.rb
lib/gitlab/upgrader.rb
+1
-1
lib/support/deploy/deploy.sh
lib/support/deploy/deploy.sh
+2
-2
No files found.
.gitlab-ci.yml
View file @
7e51cd32
...
@@ -107,7 +107,7 @@ setup-test-env:
...
@@ -107,7 +107,7 @@ setup-test-env:
<<
:
*dedicated-runner
<<
:
*dedicated-runner
stage
:
prepare
stage
:
prepare
script
:
script
:
-
bundle exec rake
assets:pre
compile 2>/dev/null
-
bundle exec rake
gitlab:assets:
compile 2>/dev/null
-
bundle exec ruby -Ispec -e 'require "spec_helper" ; TestEnv.init'
-
bundle exec ruby -Ispec -e 'require "spec_helper" ; TestEnv.init'
artifacts
:
artifacts
:
expire_in
:
7d
expire_in
:
7d
...
...
app/models/application_setting.rb
View file @
7e51cd32
...
@@ -158,7 +158,7 @@ class ApplicationSetting < ActiveRecord::Base
...
@@ -158,7 +158,7 @@ class ApplicationSetting < ActiveRecord::Base
Rails
.
cache
.
delete
(
CACHE_KEY
)
Rails
.
cache
.
delete
(
CACHE_KEY
)
rescue
rescue
# Gracefully handle when Redis is not available. For example,
# Gracefully handle when Redis is not available. For example,
# omnibus may fail here during
assets:pre
compile.
# omnibus may fail here during
gitlab:assets:
compile.
end
end
def
self
.
cached
def
self
.
cached
...
...
doc/administration/raketasks/maintenance.md
View file @
7e51cd32
...
@@ -172,14 +172,14 @@ Omnibus packages.
...
@@ -172,14 +172,14 @@ Omnibus packages.
```
```
cd /home/git/gitlab
cd /home/git/gitlab
sudo -u git -H bundle exec rake
assets:pre
compile RAILS_ENV=production
sudo -u git -H bundle exec rake
gitlab:assets:
compile RAILS_ENV=production
```
```
For omnibus versions, the unoptimized assets (JavaScript, CSS) are frozen at
For omnibus versions, the unoptimized assets (JavaScript, CSS) are frozen at
the release of upstream GitLab. The omnibus version includes optimized versions
the release of upstream GitLab. The omnibus version includes optimized versions
of those assets. Unless you are modifying the JavaScript / CSS code on your
of those assets. Unless you are modifying the JavaScript / CSS code on your
production machine after installing the package, there should be no reason to redo
production machine after installing the package, there should be no reason to redo
rake
assets:pre
compile on the production machine. If you suspect that assets
rake
gitlab:assets:
compile on the production machine. If you suspect that assets
have been corrupted, you should reinstall the omnibus package.
have been corrupted, you should reinstall the omnibus package.
## Tracking Deployments
## Tracking Deployments
...
...
doc/api/commits.md
View file @
7e51cd32
...
@@ -245,7 +245,7 @@ Example response:
...
@@ -245,7 +245,7 @@ Example response:
```
json
```
json
[
[
{
{
"diff"
:
"--- a/doc/update/5.4-to-6.0.md
\n
+++ b/doc/update/5.4-to-6.0.md
\n
@@ -71,6 +71,8 @@
\n
sudo -u git -H bundle exec rake migrate_keys RAILS_ENV=production
\n
sudo -u git -H bundle exec rake migrate_inline_notes RAILS_ENV=production
\n
\n
+sudo -u git -H bundle exec rake
assets:pre
compile RAILS_ENV=production
\n
+
\n
```
\n
\n
### 6. Update config files"
,
"diff"
:
"--- a/doc/update/5.4-to-6.0.md
\n
+++ b/doc/update/5.4-to-6.0.md
\n
@@ -71,6 +71,8 @@
\n
sudo -u git -H bundle exec rake migrate_keys RAILS_ENV=production
\n
sudo -u git -H bundle exec rake migrate_inline_notes RAILS_ENV=production
\n
\n
+sudo -u git -H bundle exec rake
gitlab:assets:
compile RAILS_ENV=production
\n
+
\n
```
\n
\n
### 6. Update config files"
,
"new_path"
:
"doc/update/5.4-to-6.0.md"
,
"new_path"
:
"doc/update/5.4-to-6.0.md"
,
"old_path"
:
"doc/update/5.4-to-6.0.md"
,
"old_path"
:
"doc/update/5.4-to-6.0.md"
,
"a_mode"
:
null
,
"a_mode"
:
null
,
...
...
doc/install/installation.md
View file @
7e51cd32
...
@@ -448,7 +448,7 @@ Check if GitLab and its environment are configured correctly:
...
@@ -448,7 +448,7 @@ Check if GitLab and its environment are configured correctly:
### Compile Assets
### Compile Assets
sudo -u git -H bundle exec rake
assets:pre
compile RAILS_ENV=production
sudo -u git -H bundle exec rake
gitlab:assets:
compile RAILS_ENV=production
### Start Your GitLab Instance
### Start Your GitLab Instance
...
...
doc/install/relative_url.md
View file @
7e51cd32
...
@@ -118,7 +118,7 @@ Make sure to follow all steps below:
...
@@ -118,7 +118,7 @@ Make sure to follow all steps below:
```
```
cd /home/git/gitlab
cd /home/git/gitlab
sudo -u git -H bundle exec rake
assets:clean assets:pre
compile RAILS_ENV=production
sudo -u git -H bundle exec rake
gitlab:assets:clean gitlab:assets:
compile RAILS_ENV=production
```
```
1.
[
Restart GitLab
][]
for the changes to take effect.
1.
[
Restart GitLab
][]
for the changes to take effect.
...
...
doc/update/patch_versions.md
View file @
7e51cd32
...
@@ -57,7 +57,7 @@ sudo -u git -H bundle clean
...
@@ -57,7 +57,7 @@ sudo -u git -H bundle clean
sudo
-u
git
-H
bundle
exec
rake db:migrate
RAILS_ENV
=
production
sudo
-u
git
-H
bundle
exec
rake db:migrate
RAILS_ENV
=
production
# Clean up assets and cache
# Clean up assets and cache
sudo
-u
git
-H
bundle
exec
rake
assets:clean assets:pre
compile cache:clear
RAILS_ENV
=
production
sudo
-u
git
-H
bundle
exec
rake
gitlab:assets:clean gitlab:assets:
compile cache:clear
RAILS_ENV
=
production
```
```
### 4. Update gitlab-workhorse to the corresponding version
### 4. Update gitlab-workhorse to the corresponding version
...
...
lib/gitlab/upgrader.rb
View file @
7e51cd32
...
@@ -61,7 +61,7 @@ module Gitlab
...
@@ -61,7 +61,7 @@ module Gitlab
"Switch to new version"
=>
%W(
#{
Gitlab
.
config
.
git
.
bin_path
}
checkout v
#{
latest_version
}
)
,
"Switch to new version"
=>
%W(
#{
Gitlab
.
config
.
git
.
bin_path
}
checkout v
#{
latest_version
}
)
,
"Install gems"
=>
%W(bundle)
,
"Install gems"
=>
%W(bundle)
,
"Migrate DB"
=>
%W(bundle exec rake db:migrate)
,
"Migrate DB"
=>
%W(bundle exec rake db:migrate)
,
"Recompile assets"
=>
%W(bundle exec rake
assets:clean assets:pre
compile)
,
"Recompile assets"
=>
%W(bundle exec rake
gitlab:assets:clean gitlab:assets:
compile)
,
"Clear cache"
=>
%W(bundle exec rake cache:clear)
"Clear cache"
=>
%W(bundle exec rake cache:clear)
}
}
end
end
...
...
lib/support/deploy/deploy.sh
View file @
7e51cd32
...
@@ -31,8 +31,8 @@ echo 'Deploy: Bundle and migrate'
...
@@ -31,8 +31,8 @@ echo 'Deploy: Bundle and migrate'
sudo
-u
git
-H
bundle
--without
aws development
test
mysql
--deployment
sudo
-u
git
-H
bundle
--without
aws development
test
mysql
--deployment
sudo
-u
git
-H
bundle
exec
rake db:migrate
RAILS_ENV
=
production
sudo
-u
git
-H
bundle
exec
rake db:migrate
RAILS_ENV
=
production
sudo
-u
git
-H
bundle
exec
rake assets:clean
RAILS_ENV
=
production
sudo
-u
git
-H
bundle
exec
rake
gitlab:
assets:clean
RAILS_ENV
=
production
sudo
-u
git
-H
bundle
exec
rake
assets:pre
compile
RAILS_ENV
=
production
sudo
-u
git
-H
bundle
exec
rake
gitlab:assets:
compile
RAILS_ENV
=
production
sudo
-u
git
-H
bundle
exec
rake cache:clear
RAILS_ENV
=
production
sudo
-u
git
-H
bundle
exec
rake cache:clear
RAILS_ENV
=
production
# return stashed changes (if necessary)
# return stashed changes (if necessary)
...
...
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