summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-10-29 17:10:36 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-10-29 17:10:36 +0000
commitf01e311ed134689066cd65312ff58003068259d7 (patch)
tree6e2e99389dea52b9ac1bc4dfea58e43d70aa9e85
parenta565c51b86d0e92fd5ab9a295ace8f18cd0b5ec9 (diff)
parent1d0f638248edc12c1e36f3276e895eee31584601 (diff)
downloadgitlab-ce-f01e311ed134689066cd65312ff58003068259d7.tar.gz
Merge branch 'update-gitlab-shell-to-corresponding-version' into 'master'
Update gitlab shell to corresponding version This prevents people upgrading to a to recent version of GitLab Shell as happend in https://gitlab.com/gitlab-org/gitlab-ce/issues/700 See merge request !227
-rw-r--r--doc/update/patch_versions.md6
1 files changed, 2 insertions, 4 deletions
diff --git a/doc/update/patch_versions.md b/doc/update/patch_versions.md
index c4a77d12800..629c46ad030 100644
--- a/doc/update/patch_versions.md
+++ b/doc/update/patch_versions.md
@@ -26,16 +26,14 @@ sudo -u git -H git checkout LATEST_TAG
Replace LATEST_TAG with the latest GitLab tag you want to upgrade to, for example `v6.6.3`.
-### 3. Update gitlab-shell if it is not the latest version
+### 3. Update gitlab-shell to the corresponding version
```bash
cd /home/git/gitlab-shell
sudo -u git -H git fetch
-sudo -u git -H git checkout LATEST_TAG
+sudo -u git -H git checkout v`cat /home/git/gitlab/GITLAB_SHELL_VERSION`
```
-Replace LATEST_TAG with the latest GitLab Shell tag you want to upgrade to, for example `v1.7.9`.
-
### 4. Install libs, migrations, etc.
```bash