summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-01-22 12:08:26 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-01-22 12:08:26 +0000
commitfaa9ca0900438809a8faa21bc6daca1364cc6eaa (patch)
treecca814b766294164cbfb2bb86fbf2534937fceb6
parentbc2214da82082c0424048c433daf3aae65d80e7f (diff)
parent3a5cca26c978656391c2304675e5f4aa090715a3 (diff)
downloadgitlab-ce-faa9ca0900438809a8faa21bc6daca1364cc6eaa.tar.gz
Merge branch 'patch-1' into 'master'
GitLab 8.4 uses gitlab-shell v2.6.10 While upgrading to GitLab 8.3 to 8.4 there was a warning massage for using GitLab 8.3 with gitlab-shell v2.6.9 so I changed gitlab-shell version to v2.6.10 and it worked. See merge request !2555
-rw-r--r--doc/update/8.3-to-8.4.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/update/8.3-to-8.4.md b/doc/update/8.3-to-8.4.md
index bf80f66d004..164cbcb53ce 100644
--- a/doc/update/8.3-to-8.4.md
+++ b/doc/update/8.3-to-8.4.md
@@ -37,7 +37,7 @@ sudo -u git -H git checkout 8-4-stable-ee
```bash
cd /home/git/gitlab-shell
sudo -u git -H git fetch --all
-sudo -u git -H git checkout v2.6.9
+sudo -u git -H git checkout v2.6.10
```
### 5. Update gitlab-workhorse