diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-03-18 13:49:53 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-04-01 16:29:26 +0200 |
| commit | 4b4de7b7aa98eebc53850a4560c63f4e19b731ec (patch) | |
| tree | 4d754999a2ce0d960dfc434b953d243968cb8890 | |
| parent | 80910076eb8c93312830f52785b14a4ea8c2f174 (diff) | |
| download | gitlab-ce-4b4de7b7aa98eebc53850a4560c63f4e19b731ec.tar.gz | |
Merge branch 'fix/update-gitlab-shell' into 'master'
Update gitlab-shell version and doc to 2.6.12
See merge request !280
| -rw-r--r-- | GITLAB_SHELL_VERSION | 2 | ||||
| -rw-r--r-- | 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 bc02b8685c1..c959dfbbd42 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 b9abcbd2c12..6267f14eba4 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 |