summaryrefslogtreecommitdiff
path: root/doc/update/6.4-to-6.5.md
diff options
context:
space:
mode:
Diffstat (limited to 'doc/update/6.4-to-6.5.md')
-rw-r--r--doc/update/6.4-to-6.5.md23
1 files changed, 12 insertions, 11 deletions
diff --git a/doc/update/6.4-to-6.5.md b/doc/update/6.4-to-6.5.md
index c88be3582cf..1a95a98b6f2 100644
--- a/doc/update/6.4-to-6.5.md
+++ b/doc/update/6.4-to-6.5.md
@@ -1,24 +1,24 @@
# From 6.4 to 6.5
-### 0. Backup
+## 0. Backup
```bash
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-5-stable
@@ -32,7 +32,7 @@ For GitLab Enterprise Edition:
sudo -u git -H git checkout 6-5-stable-ee
```
-### 3. Update gitlab-shell (and its config)
+## 3. Update gitlab-shell (and its config)
```bash
cd /home/git/gitlab-shell
@@ -40,7 +40,7 @@ sudo -u git -H git fetch
sudo -u git -H git checkout v1.8.0
```
-### 4. Install libs, migrations, etc.
+## 4. Install libs, migrations, etc.
```bash
cd /home/git/gitlab
@@ -62,12 +62,12 @@ 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
```
-### 5. Start application
+## 5. Start application
sudo service gitlab start
sudo service nginx restart
-### 6. Check application status
+## 6. Check application status
Check if GitLab and its environment are configured correctly:
@@ -82,13 +82,14 @@ If all items are green, then congratulations upgrade is complete!
## Things went south? Revert to previous version (6.4)
### 1. Revert the code to the previous version
-Follow the [`upgrade guide from 6.3 to 6.4`](6.3-to-6.4.md), except for the database migration
-(The backup is already migrated to the previous version)
-### 2. Restore from the backup:
+Follow the [`upgrade guide from 6.3 to 6.4`](6.3-to-6.4.md), except for the database migration (the backup is already migrated to the previous version).
+
+### 2. Restore from the backup
```bash
cd /home/git/gitlab
sudo -u git -H bundle exec rake gitlab:backup:restore RAILS_ENV=production
```
+
If you have more than one backup *.tar file(s) please add `BACKUP=timestamp_of_backup` to the command above.