summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-10-03 10:46:05 +0000
committerRémy Coutable <remy@rymai.me>2016-10-03 10:46:05 +0000
commit2cbc7a788ebb761aa713cdeed94b07a6f6264cd9 (patch)
tree49ef5c3853f6c91202bbcb8b66af2beb1c3916ff
parentd9f9ad9d7d672574a227dd6143cd3d08f2381be5 (diff)
parent629b56288baad0abe76a977091c571a5747e43e0 (diff)
downloadgitlab-ce-2cbc7a788ebb761aa713cdeed94b07a6f6264cd9.tar.gz
Merge branch 'update-gitlab-shell-3-6-3' into 'master'
Update GITLAB_SHELL_VERSION to 3.6.3 Because VERSION at the gitlab-shell v3.6.2 tag was still 3.6.1: https://gitlab.com/gitlab-org/gitlab-shell/blob/v3.6.2/VERSION (my bad!) VERSION at the v3.6.3 tag is now 3.6.3: https://gitlab.com/gitlab-org/gitlab-shell/blob/v3.6.3/VERSION See merge request !6621
-rw-r--r--GITLAB_SHELL_VERSION2
-rw-r--r--doc/update/8.12-to-8.13.md2
2 files changed, 2 insertions, 2 deletions
diff --git a/GITLAB_SHELL_VERSION b/GITLAB_SHELL_VERSION
index b72762837ea..4a788a01dad 100644
--- a/GITLAB_SHELL_VERSION
+++ b/GITLAB_SHELL_VERSION
@@ -1 +1 @@
-3.6.2
+3.6.3
diff --git a/doc/update/8.12-to-8.13.md b/doc/update/8.12-to-8.13.md
index d61c76673f7..411e4837e20 100644
--- a/doc/update/8.12-to-8.13.md
+++ b/doc/update/8.12-to-8.13.md
@@ -72,7 +72,7 @@ sudo -u git -H git checkout 8-13-stable-ee
```bash
cd /home/git/gitlab-shell
sudo -u git -H git fetch --all --tags
-sudo -u git -H git checkout v3.6.2
+sudo -u git -H git checkout v3.6.3
```
### 6. Update gitlab-workhorse