diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-22 18:05:54 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-22 18:05:54 +0000 |
| commit | 8ee0746f54c19fcb8fe81058594aa8d373c5b7d7 (patch) | |
| tree | 20a12d8ca17f2fd5f43c0d9a75963fb307832807 | |
| parent | bb2a33813d6156494069a353d12d2858725fc9e0 (diff) | |
| download | gitlab-ce-8ee0746f54c19fcb8fe81058594aa8d373c5b7d7.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.1
| -rw-r--r-- | CHANGELOG.md | 7 | ||||
| -rw-r--r-- | GITALY_SERVER_VERSION | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/update-gitlab-shell-13-11-0.yml | 5 | ||||
| -rwxr-xr-x[-rw-r--r--] | vendor/gitignore/C++.gitignore | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | vendor/gitignore/Java.gitignore | 0 |
5 files changed, 8 insertions, 6 deletions
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 index 259148fa18f..259148fa18f 100644..100755 --- a/vendor/gitignore/C++.gitignore +++ b/vendor/gitignore/C++.gitignore diff --git a/vendor/gitignore/Java.gitignore b/vendor/gitignore/Java.gitignore index a1c2a238a96..a1c2a238a96 100644..100755 --- a/vendor/gitignore/Java.gitignore +++ b/vendor/gitignore/Java.gitignore |