summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md9
-rw-r--r--GITALY_SERVER_VERSION2
-rw-r--r--changelogs/unreleased/330787-omits-trailing-slash-when-checking-for-allowed-requests.yml5
-rw-r--r--changelogs/unreleased/sh-avoid-trailing-slash-in-proxy.yml5
-rw-r--r--changelogs/unreleased/sh-fix-nplus-one-pipelines-show.yml5
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