summaryrefslogtreecommitdiff
path: root/doc/update/upgrader.md
diff options
context:
space:
mode:
Diffstat (limited to 'doc/update/upgrader.md')
-rw-r--r--doc/update/upgrader.md27
1 files changed, 16 insertions, 11 deletions
diff --git a/doc/update/upgrader.md b/doc/update/upgrader.md
index 19faca4ec4e..00dc87e2f99 100644
--- a/doc/update/upgrader.md
+++ b/doc/update/upgrader.md
@@ -1,22 +1,25 @@
-# GitLab Upgrader
+# GitLab Upgrader
GitLab Upgrader - a ruby script that allows you easily upgrade GitLab to latest minor version.
+
For example it can update your application from 6.4 to latest GitLab 6 version (like 6.6.1).
-You still need to create a a backup and manually restart GitLab after runnning the script but all other operations are done by this upgrade script.
+
+You still need to create a backup and manually restart GitLab after running the script but all other operations are done by this upgrade script.
+
If you have local changes to your GitLab repository the script will stash them and you need to use `git stash pop` after running the script.
-__GitLab Upgrader is available only for GitLab version 6.4.2 or higher__
+**GitLab Upgrader is available only for GitLab version 6.4.2 or higher.**
-### 0. Backup
+## 0. Backup
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. Run gitlab upgrade tool
+## 2. Run GitLab upgrade tool
# Starting with GitLab version 7.0 upgrader script has been moved to bin directory
cd /home/git/gitlab
@@ -25,12 +28,12 @@ __GitLab Upgrader is available only for GitLab version 6.4.2 or higher__
# to perform a non-interactive install (no user input required) you can add -y
# if [ -f bin/upgrade.rb ]; then sudo -u git -H ruby bin/upgrade.rb -y; else sudo -u git -H ruby script/upgrade.rb -y; fi
-### 3. Start application
+## 3. Start application
sudo service gitlab start
sudo service nginx restart
-### 4. Check application status
+## 4. Check application status
Check if GitLab and its dependencies are configured correctly:
@@ -38,9 +41,10 @@ Check if GitLab and its dependencies are configured correctly:
If all items are green, then congratulations upgrade is complete!
-### 5. Upgrade GitLab Shell (if needed)
+## 5. Upgrade GitLab Shell (if needed)
+
+If the `gitlab:check` task reports an outdated version of `gitlab-shell` you should upgrade it.
-If the `gitlab:check` task reports an outdated version of gitlab-shell you should upgrade it.
Upgrade it by running the commands below after replacing 1.9.4 with the correct version number:
```
@@ -49,9 +53,10 @@ sudo -u git -H git fetch
sudo -u git -H git checkout v1.9.4
```
-### One line upgrade command
+## One line upgrade command
You've read through the entire guide and probably already did all the steps one by one.
+
Here is a one line command with step 1 to 4 for the next time you upgrade:
```bash