diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-09-14 09:06:12 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-09-14 09:06:12 +0000 |
| commit | eab72755cd9e0ac7f9ba6d30ad877b3aef14841b (patch) | |
| tree | 00c4f358c46eb5186395282c3052a230baafc759 | |
| parent | 2c9ab6a78f07f4d2d5ead4ac9f76eb59c729ae32 (diff) | |
| parent | 178b2cdcec7b9a23d7e2fd4376878d62fcba7f88 (diff) | |
| download | gitlab-ce-21249-update-labels-sidebar-live-after-slash-command-existing-issue-mr-ajax.tar.gz | |
Merge branch 'gitlab_shell_350' into 'master'
21249-update-labels-sidebar-live-after-slash-command-existing-issue-mr-ajax
Update GITLAB_SHELL_VERSION to 3.5.0 to include the 2FA recovery commands.
See merge request !6227
| -rw-r--r-- | GITLAB_SHELL_VERSION | 2 | ||||
| -rw-r--r-- | doc/update/8.11-to-8.12.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/GITLAB_SHELL_VERSION b/GITLAB_SHELL_VERSION index 18091983f59..1545d966571 100644 --- a/GITLAB_SHELL_VERSION +++ b/GITLAB_SHELL_VERSION @@ -1 +1 @@ -3.4.0 +3.5.0 diff --git a/doc/update/8.11-to-8.12.md b/doc/update/8.11-to-8.12.md index 011c2b0e969..8017c36587e 100644 --- a/doc/update/8.11-to-8.12.md +++ b/doc/update/8.11-to-8.12.md @@ -70,7 +70,7 @@ sudo -u git -H git checkout 8-12-stable-ee ```bash cd /home/git/gitlab-shell sudo -u git -H git fetch --all --tags -sudo -u git -H git checkout v3.4.0 +sudo -u git -H git checkout v3.5.0 ``` ### 6. Update gitlab-workhorse |