summaryrefslogtreecommitdiff
path: root/doc/update
diff options
context:
space:
mode:
authorMarin Jankovski <maxlazio@gmail.com>2015-02-23 23:10:35 -0800
committerMarin Jankovski <maxlazio@gmail.com>2015-02-23 23:10:35 -0800
commit2feaa69cd5831578f99c3833f8b1e3e5a8031c1d (patch)
treed032f8b17a3655993b0baadea4da445a6367e78f /doc/update
parentac918a5cdb405ce81d89c57a9309b52df7c9ca42 (diff)
downloadgitlab-ce-2feaa69cd5831578f99c3833f8b1e3e5a8031c1d.tar.gz
Update version of gitlab-shell in the installation and update documentation.
Diffstat (limited to 'doc/update')
-rw-r--r--doc/update/6.x-or-7.x-to-7.8.md4
-rw-r--r--doc/update/7.7-to-7.8.md4
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/update/6.x-or-7.x-to-7.8.md b/doc/update/6.x-or-7.x-to-7.8.md
index 859f4c1a6d6..5884312c47f 100644
--- a/doc/update/6.x-or-7.x-to-7.8.md
+++ b/doc/update/6.x-or-7.x-to-7.8.md
@@ -123,7 +123,7 @@ sudo apt-get install libkrb5-dev
```bash
cd /home/git/gitlab-shell
sudo -u git -H git fetch
-sudo -u git -H git checkout v2.4.3
+sudo -u git -H git checkout v2.5.4
```
## 7. Install libs, migrations, etc.
@@ -163,7 +163,7 @@ git diff 6-0-stable:config/gitlab.yml.example 7-8-stable:config/gitlab.yml.examp
* Make `/home/git/gitlab/config/gitlab.yml` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-8-stable/config/gitlab.yml.example but with your settings.
* Make `/home/git/gitlab/config/unicorn.rb` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/7-8-stable/config/unicorn.rb.example but with your settings.
-* Make `/home/git/gitlab-shell/config.yml` the same as https://gitlab.com/gitlab-org/gitlab-shell/blob/v2.4.3/config.yml.example but with your settings.
+* Make `/home/git/gitlab-shell/config.yml` the same as https://gitlab.com/gitlab-org/gitlab-shell/blob/v2.5.4/config.yml.example but with your settings.
* Copy rack attack middleware config
```bash
diff --git a/doc/update/7.7-to-7.8.md b/doc/update/7.7-to-7.8.md
index a8a5c7f66c6..46ca163c1bb 100644
--- a/doc/update/7.7-to-7.8.md
+++ b/doc/update/7.7-to-7.8.md
@@ -37,7 +37,7 @@ sudo -u git -H git checkout 7-8-stable-ee
```bash
cd /home/git/gitlab-shell
sudo -u git -H git fetch
-sudo -u git -H git checkout v2.5.3
+sudo -u git -H git checkout v2.5.4
```
### 4. Install libs, migrations, etc.
@@ -102,7 +102,7 @@ If all items are green, then congratulations upgrade is complete!
### 8. GitHub settings (if applicable)
-If you are using GitHub as an OAuth provider for authentication, you should change the callback URL so that it
+If you are using GitHub as an OAuth provider for authentication, you should change the callback URL so that it
only contains a root URL (ex. `https://gitlab.example.com/`)
## Things went south? Revert to previous version (7.7)