diff options
author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-12-19 17:18:48 +0000 |
---|---|---|
committer | Alejandro RodrÃguez <alejorro70@gmail.com> | 2017-01-23 23:32:21 -0300 |
commit | fb93d4c04c0cce470877db55b562eb0d404ba676 (patch) | |
tree | 4458f24800011ee90e48f812618a27be674c53f5 | |
parent | 36ac9b108db2c73d36b4bb15b9287eb031c98cc6 (diff) | |
download | gitlab-ce-fb93d4c04c0cce470877db55b562eb0d404ba676.tar.gz |
Merge branch 'update-gitlab-shell-4-1-1' into 'master'
Bump gitlab-shell to 4.1.1
This fixes a compatibility issue with Git 2.11 (#25301):
- [x] gitlab-shell MR: gitlab-org/gitlab-shell!112
- [x] CE MR: !7967
- [x] EE MR: gitlab-org/gitlab-ee!964
See merge request !8143
-rw-r--r-- | GITLAB_SHELL_VERSION | 2 | ||||
-rw-r--r-- | doc/update/8.13-to-8.14.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/GITLAB_SHELL_VERSION b/GITLAB_SHELL_VERSION index c4e41f94594..627a3f43a64 100644 --- a/GITLAB_SHELL_VERSION +++ b/GITLAB_SHELL_VERSION @@ -1 +1 @@ -4.0.3 +4.1.1 diff --git a/doc/update/8.13-to-8.14.md b/doc/update/8.13-to-8.14.md index d50f29280ed..f75e99c5314 100644 --- a/doc/update/8.13-to-8.14.md +++ b/doc/update/8.13-to-8.14.md @@ -72,7 +72,7 @@ sudo -u git -H git checkout 8-14-stable-ee ```bash cd /home/git/gitlab-shell sudo -u git -H git fetch --all --tags -sudo -u git -H git checkout v4.0.0 +sudo -u git -H git checkout v4.1.1 ``` ### 6. Update gitlab-workhorse |