summaryrefslogtreecommitdiff
path: root/doc/update/6.0-to-6.8.md
diff options
context:
space:
mode:
Diffstat (limited to 'doc/update/6.0-to-6.8.md')
-rw-r--r--doc/update/6.0-to-6.8.md40
1 files changed, 21 insertions, 19 deletions
diff --git a/doc/update/6.0-to-6.8.md b/doc/update/6.0-to-6.8.md
index 5c71e99aa52..0205d0d2e22 100644
--- a/doc/update/6.0-to-6.8.md
+++ b/doc/update/6.0-to-6.8.md
@@ -1,15 +1,16 @@
# From 6.0 to 6.8
-# In 6.1 we remove a lot of deprecated code.
-# You should update to 6.0 before installing 6.1 or higher so all the necessary conversions are run.
+**In 6.1 we remove a lot of deprecated code.**
-### Deprecations
+**You should update to 6.0 before installing 6.1 or higher so all the necessary conversions are run.**
-#### Global issue numbers
+## Deprecations
-As of 6.1 issue numbers are project specific. This means all issues are renumbered and get a new number in their url. If you use an old issue number url and the issue number does not exist yet you are redirected to the new one. This conversion does not trigger if the old number already exists for this project, this is unlikely but will happen with old issues and large projects.
+## Global issue numbers
-### 0. Backup
+As of 6.1 issue numbers are project specific. This means all issues are renumbered and get a new number in their URL. If you use an old issue number URL and the issue number does not exist yet you are redirected to the new one. This conversion does not trigger if the old number already exists for this project, this is unlikely but will happen with old issues and large projects.
+
+## 0. Backup
It's useful to make a backup just in case things go south:
(With MySQL, this may require granting "LOCK TABLES" privileges to the GitLab user on the database version)
@@ -19,18 +20,18 @@ cd /home/git/gitlab
sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production
```
-### 1. Stop server
+## 1. Stop server
sudo service gitlab stop
-### 2. Get latest code
+## 2. Get latest code
```bash
cd /home/git/gitlab
sudo -u git -H git fetch --all
```
-For Gitlab Community Edition:
+For GitLab Community Edition:
```bash
sudo -u git -H git checkout 6-8-stable
@@ -45,14 +46,14 @@ sudo -u git -H git checkout 6-8-stable-ee
```
-### 3. Install additional packages
+## 3. Install additional packages
```bash
# Add support for lograte for better log file handling
sudo apt-get install logrotate
```
-### 4. Update gitlab-shell
+## 4. Update gitlab-shell
```bash
cd /home/git/gitlab-shell
@@ -60,7 +61,7 @@ sudo -u git -H git fetch
sudo -u git -H git checkout v1.9.3 # Addresses multiple critical security vulnerabilities
```
-### 5. Install libs, migrations, etc.
+## 5. Install libs, migrations, etc.
```bash
cd /home/git/gitlab
@@ -85,7 +86,7 @@ sudo -u git -H bundle exec rake assets:clean assets:precompile cache:clear RAILS
sudo chmod u+rwx,g+rx,o-rwx /home/git/gitlab-satellites
```
-### 6. Update config files
+## 6. Update config files
TIP: to see what changed in gitlab.yml.example in this release use next command:
@@ -108,18 +109,18 @@ sudo -u git -H cp config/initializers/rack_attack.rb.example config/initializers
sudo cp lib/support/logrotate/gitlab /etc/logrotate.d/gitlab
```
-### 7. Update Init script
+## 7. Update Init script
```bash
sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
```
-### 8. Start application
+## 8. Start application
sudo service gitlab start
sudo service nginx restart
-### 9. Check application status
+## 9. Check application status
Check if GitLab and its environment are configured correctly:
@@ -135,8 +136,8 @@ If all items are green, then congratulations upgrade complete!
## Things went south? Revert to previous version (6.0)
### 1. Revert the code to the previous version
-Follow the [`upgrade guide from 5.4 to 6.0`](5.4-to-6.0.md), except for the database migration
-(The backup is already migrated to the previous version)
+
+Follow the [`upgrade guide from 5.4 to 6.0`](5.4-to-6.0.md), except for the database migration (the backup is already migrated to the previous version).
### 2. Restore from the backup:
@@ -146,4 +147,5 @@ sudo -u git -H bundle exec rake gitlab:backup:restore RAILS_ENV=production
```
## Login issues after upgrade?
-If running in https mode, be sure to read [Can't Verify csrf token authenticity](https://github.com/gitlabhq/gitlab-public-wiki/wiki/Trouble-Shooting-Guide#cant-verify-csrf-token-authenticitycant-get-past-login-pageredirected-to-login-page)
+
+If running in HTTPS mode, be sure to read [Can't Verify CSRF token authenticity](https://github.com/gitlabhq/gitlab-public-wiki/wiki/Trouble-Shooting-Guide#cant-verify-csrf-token-authenticitycant-get-past-login-pageredirected-to-login-page)