summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-01-13 19:21:57 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-01-13 19:21:57 +0000
commit2f14978e280347568a7437aeac121ad70e90bf3c (patch)
tree24d3203709efa8ac034549c63afc42e468642df2
parentf0f0065a0d5c0677a91590352c7f0a4052c8c6f9 (diff)
downloadgitlab-ce-2f14978e280347568a7437aeac121ad70e90bf3c.tar.gz
Add latest changes from gitlab-org/security/gitlab@13-7-stable-eev13.7.4
-rw-r--r--CHANGELOG.md7
-rw-r--r--GITALY_SERVER_VERSION2
-rw-r--r--changelogs/unreleased/security-deny-implicit-confidential.yml5
3 files changed, 8 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 86cdb79d4db..f14f7fa6325 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 13.7.4 (2021-01-13)
+
+### Security (1 change)
+
+- Deny implicit flow for confidential apps.
+
+
## 13.7.3 (2021-01-08)
### Fixed (7 changes)
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index e32d1dd484c..1fabcd61c9c 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-13.7.3 \ No newline at end of file
+13.7.4 \ No newline at end of file
diff --git a/changelogs/unreleased/security-deny-implicit-confidential.yml b/changelogs/unreleased/security-deny-implicit-confidential.yml
deleted file mode 100644
index bbf2d95b3fb..00000000000
--- a/changelogs/unreleased/security-deny-implicit-confidential.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Deny implicit flow for confidential apps
-merge_request:
-author:
-type: security