diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-14 13:07:31 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-14 13:07:31 +0000 |
| commit | cea3c37b30e6ec5e433248fc0a5549430dcd5864 (patch) | |
| tree | f7b51d511e40aa47bf09c9a5c9ebec4579cdaf45 | |
| parent | 701a1272368e7acbc66b2532596a998e01e880f4 (diff) | |
| download | gitlab-ce-cea3c37b30e6ec5e433248fc0a5549430dcd5864.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.4
| -rw-r--r-- | CHANGELOG.md | 9 | ||||
| -rw-r--r-- | GITALY_SERVER_VERSION | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/330787-omits-trailing-slash-when-checking-for-allowed-requests.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-avoid-trailing-slash-in-proxy.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-fix-nplus-one-pipelines-show.yml | 5 |
5 files changed, 10 insertions, 16 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index aeb9d376f88..e8cfa50add9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,15 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 13.11.4 (2021-05-14) + +### Fixed (3 changes) + +- Fix N+1 SQL queries in PipelinesController#show. !60794 +- Omit trailing slash when proxying pre-authorized routes with no suffix. !61638 +- Omit trailing slash when checking allowed requests in the read-only middleware. !61641 + + ## 13.11.3 (2021-04-30) ### Fixed (1 change) diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index fd9f2853155..93c33809bba 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -13.11.3
\ No newline at end of file +13.11.4
\ No newline at end of file diff --git a/changelogs/unreleased/330787-omits-trailing-slash-when-checking-for-allowed-requests.yml b/changelogs/unreleased/330787-omits-trailing-slash-when-checking-for-allowed-requests.yml deleted file mode 100644 index 6e04471fa13..00000000000 --- a/changelogs/unreleased/330787-omits-trailing-slash-when-checking-for-allowed-requests.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Omit trailing slash when checking allowed requests in the read-only middleware -merge_request: 61641 -author: -type: fixed diff --git a/changelogs/unreleased/sh-avoid-trailing-slash-in-proxy.yml b/changelogs/unreleased/sh-avoid-trailing-slash-in-proxy.yml deleted file mode 100644 index 3bea1874ff3..00000000000 --- a/changelogs/unreleased/sh-avoid-trailing-slash-in-proxy.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Omit trailing slash when proxying pre-authorized routes with no suffix -merge_request: 61638 -author: -type: fixed diff --git a/changelogs/unreleased/sh-fix-nplus-one-pipelines-show.yml b/changelogs/unreleased/sh-fix-nplus-one-pipelines-show.yml deleted file mode 100644 index ebaf2aee123..00000000000 --- a/changelogs/unreleased/sh-fix-nplus-one-pipelines-show.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix N+1 SQL queries in PipelinesController#show -merge_request: 60794 -author: -type: fixed |