From 4b4de7b7aa98eebc53850a4560c63f4e19b731ec Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Fri, 18 Mar 2016 13:49:53 +0000
Subject: [PATCH] Merge branch 'fix/update-gitlab-shell' into 'master'

Update gitlab-shell version and doc to 2.6.12



See merge request !280
---
 GITLAB_SHELL_VERSION     | 2 +-
 doc/update/8.5-to-8.6.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/GITLAB_SHELL_VERSION b/GITLAB_SHELL_VERSION
index bc02b8685c..c959dfbbd4 100644
--- a/GITLAB_SHELL_VERSION
+++ b/GITLAB_SHELL_VERSION
@@ -1 +1 @@
-2.6.11
+2.6.12
diff --git a/doc/update/8.5-to-8.6.md b/doc/update/8.5-to-8.6.md
index b9abcbd2c1..6267f14eba 100644
--- a/doc/update/8.5-to-8.6.md
+++ b/doc/update/8.5-to-8.6.md
@@ -46,7 +46,7 @@ sudo -u git -H git checkout 8-6-stable-ee
 ```bash
 cd /home/git/gitlab-shell
 sudo -u git -H git fetch --all
-sudo -u git -H git checkout v2.6.11
+sudo -u git -H git checkout v2.6.12
 ```
 
 ### 5. Update gitlab-workhorse