diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2014-11-20 15:31:10 +0000 |
|---|---|---|
| committer | Jacob Vosmaer <jacob@gitlab.com> | 2014-11-20 15:31:10 +0000 |
| commit | 1b34a24ffd63ac9a5a37ac0edbf3a3f2ca6d1810 (patch) | |
| tree | 1bd8958e33f686db67c80d5b103ef67b9062235b /doc | |
| parent | b036300f0ac7442c488a6eef6a85c3f6cb77d7fd (diff) | |
| parent | 2e0bbe68cb713ec35a6a68c7a54f0ad881dbea58 (diff) | |
| download | gitlab-ce-1b34a24ffd63ac9a5a37ac0edbf3a3f2ca6d1810.tar.gz | |
Merge branch 'shell220' into 'master'
Add GitLab shell update to update guide
See merge request !1269
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/update/7.4-to-7.5.md | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/doc/update/7.4-to-7.5.md b/doc/update/7.4-to-7.5.md index 737aeb9c1ab..c12becc1e14 100644 --- a/doc/update/7.4-to-7.5.md +++ b/doc/update/7.4-to-7.5.md @@ -32,7 +32,15 @@ For GitLab Enterprise Edition: sudo -u git -H git checkout 7-5-stable-ee ``` -### 3. Install libs, migrations, etc. +### 3. Update gitlab-shell + +```bash +cd /home/git/gitlab-shell +sudo -u git -H git fetch +sudo -u git -H git checkout v2.2.0 +``` + +### 4. Install libs, migrations, etc. ```bash cd /home/git/gitlab @@ -53,7 +61,7 @@ sudo -u git -H bundle exec rake assets:clean assets:precompile cache:clear RAILS sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab ``` -### 4. Update config files +### 5. Update config files #### New configuration options for gitlab.yml @@ -79,12 +87,12 @@ sudo -u git -H editor config/unicorn.rb * Add `collation: utf8_general_ci` to config/database.yml as seen in [config/database.yml.mysql](config/database.yml.mysql) -### 5. Start application +### 6. Start application sudo service gitlab start sudo service nginx restart -### 6. Check application status +### 7. Check application status Check if GitLab and its environment are configured correctly: @@ -97,7 +105,7 @@ To make sure you didn't miss anything run a more thorough check with: If all items are green, then congratulations upgrade is complete! -### 7. Optional optimizations for GitLab setups with MySQL databases +### 8. Optional optimizations for GitLab setups with MySQL databases Only applies if running MySQL database created with GitLab 6.7 or earlier. If you are not experiencing any issues you may not need the following instructions however following them will bring your database in line with the latest recommended installation configuration and help avoid future issues. Be sure to follow these directions exactly. These directions should be safe for any MySQL instance but to be sure make a current MySQL database backup beforehand. |