summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2015-12-17 21:36:33 +0000
committerRobert Speicher <robert@gitlab.com>2015-12-17 21:36:33 +0000
commit3b303febd0eb6f5a311cfa44222c87d06054ebc2 (patch)
tree7e378aac80f89b70e6c3d7beffcb7fa33a2583bd
parentb2c593dac513c0e12153e0aa786759c4ebc996bc (diff)
parent56d780cf2c5b351479f002b221755bfb85b3ff70 (diff)
downloadgitlab-ce-3b303febd0eb6f5a311cfa44222c87d06054ebc2.tar.gz
Merge branch 'gitlab-shell-2.6.9' into 'master'
Use gitlab-shell 2.6.9 See merge request !2143
-rw-r--r--GITLAB_SHELL_VERSION2
-rw-r--r--doc/update/8.2-to-8.3.md2
2 files changed, 2 insertions, 2 deletions
diff --git a/GITLAB_SHELL_VERSION b/GITLAB_SHELL_VERSION
index 743af5e1251..d48d3702aed 100644
--- a/GITLAB_SHELL_VERSION
+++ b/GITLAB_SHELL_VERSION
@@ -1 +1 @@
-2.6.8
+2.6.9
diff --git a/doc/update/8.2-to-8.3.md b/doc/update/8.2-to-8.3.md
index b7022458396..c4661dc16af 100644
--- a/doc/update/8.2-to-8.3.md
+++ b/doc/update/8.2-to-8.3.md
@@ -67,7 +67,7 @@ sudo -u git -H git checkout 8-3-stable-ee
```bash
cd /home/git/gitlab-shell
sudo -u git -H git fetch --all
-sudo -u git -H git checkout v2.6.8
+sudo -u git -H git checkout v2.6.9
```
### 5. Update gitlab-workhorse