From 8ee0746f54c19fcb8fe81058594aa8d373c5b7d7 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 22 Oct 2020 18:05:54 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-5-stable-ee --- CHANGELOG.md | 7 +++++++ GITALY_SERVER_VERSION | 2 +- changelogs/unreleased/update-gitlab-shell-13-11-0.yml | 5 ----- vendor/gitignore/C++.gitignore | 0 vendor/gitignore/Java.gitignore | 0 5 files changed, 8 insertions(+), 6 deletions(-) delete mode 100644 changelogs/unreleased/update-gitlab-shell-13-11-0.yml mode change 100644 => 100755 vendor/gitignore/C++.gitignore mode change 100644 => 100755 vendor/gitignore/Java.gitignore diff --git a/CHANGELOG.md b/CHANGELOG.md index 84efdd7ef9f..2a25a525e8b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 13.5.1 (2020-10-22) + +### Other (1 change) + +- Update GitLab Shell to v13.11.0. !45660 + + ## 13.5.0 (2020-10-22) ### Security (1 change) diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index c92af7fbd9e..9400e4c0ada 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -13.5.0 \ No newline at end of file +13.5.1 \ No newline at end of file diff --git a/changelogs/unreleased/update-gitlab-shell-13-11-0.yml b/changelogs/unreleased/update-gitlab-shell-13-11-0.yml deleted file mode 100644 index 53dbd63b8cb..00000000000 --- a/changelogs/unreleased/update-gitlab-shell-13-11-0.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Update GitLab Shell to v13.11.0 -merge_request: 45660 -author: -type: other diff --git a/vendor/gitignore/C++.gitignore b/vendor/gitignore/C++.gitignore old mode 100644 new mode 100755 diff --git a/vendor/gitignore/Java.gitignore b/vendor/gitignore/Java.gitignore old mode 100644 new mode 100755 -- cgit v1.2.1