Commit 1b34a24f authored by Jacob Vosmaer's avatar Jacob Vosmaer

Merge branch 'shell220' into 'master'

Add GitLab shell update to update guide

See merge request !1269
parents b036300f 2e0bbe68
...@@ -32,7 +32,15 @@ For GitLab Enterprise Edition: ...@@ -32,7 +32,15 @@ For GitLab Enterprise Edition:
sudo -u git -H git checkout 7-5-stable-ee 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 ```bash
cd /home/git/gitlab cd /home/git/gitlab
...@@ -53,7 +61,7 @@ sudo -u git -H bundle exec rake assets:clean assets:precompile cache:clear RAILS ...@@ -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 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 #### New configuration options for gitlab.yml
...@@ -79,12 +87,12 @@ sudo -u git -H editor config/unicorn.rb ...@@ -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) * 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 gitlab start
sudo service nginx restart sudo service nginx restart
### 6. Check application status ### 7. Check application status
Check if GitLab and its environment are configured correctly: 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: ...@@ -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! 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. 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.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment