diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-12-19 17:18:48 +0000 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-12-19 17:18:48 +0000 |
| commit | 051c4944f6d0d34dc9b0378a3fcea6ae9f75f58d (patch) | |
| tree | 564dea9d3a67481034785ffc0e041a6c026d5bcd | |
| parent | 60f61096e17dee7ebedd94cc5f70703067528bc7 (diff) | |
| parent | 5dcd01aa96f26ff98311d0415d659d0b14e6c632 (diff) | |
| download | gitlab-ce-051c4944f6d0d34dc9b0378a3fcea6ae9f75f58d.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.14-to-8.15.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/GITLAB_SHELL_VERSION b/GITLAB_SHELL_VERSION index ee74734aa22..627a3f43a64 100644 --- a/GITLAB_SHELL_VERSION +++ b/GITLAB_SHELL_VERSION @@ -1 +1 @@ -4.1.0 +4.1.1 diff --git a/doc/update/8.14-to-8.15.md b/doc/update/8.14-to-8.15.md index 4eacab0c890..8d4bfd913bd 100644 --- a/doc/update/8.14-to-8.15.md +++ b/doc/update/8.14-to-8.15.md @@ -72,7 +72,7 @@ sudo -u git -H git checkout 8-15-stable-ee ```bash cd /home/git/gitlab-shell sudo -u git -H git fetch --all --tags -sudo -u git -H git checkout v4.1.0 +sudo -u git -H git checkout v4.1.1 ``` ### 6. Update gitlab-workhorse |