summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-06-07 17:48:04 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-06-07 17:48:04 +0000
commit757327a59bcaecb986b0c07ae0cf09ed011e18ce (patch)
treefadcda08aba5280210da899167e9682ec69d37dd
parent04a74841c1ee2c751cccf21a8e3fb2fe9abf1769 (diff)
downloadgitlab-ce-757327a59bcaecb986b0c07ae0cf09ed011e18ce.tar.gz
Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.3
-rw-r--r--CHANGELOG.md18
-rw-r--r--GITALY_SERVER_VERSION2
2 files changed, 19 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 69e1cb880ee..d0d08097a76 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,24 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 13.12.3 (2021-06-07)
+
+### Added (1 change)
+
+- [Add an option to expose description_html in Release API](gitlab-org/gitlab@47f3fba10dfa82c65b6b006d56cc1724aac411eb) ([merge request](gitlab-org/gitlab!63393))
+
+### Fixed (5 changes)
+
+- [Fix spam detection with Akismet client](gitlab-org/gitlab@75dbe8d017ed691d0517f0a6ca7b9bdd866fa9d9) ([merge request](gitlab-org/gitlab!63393))
+- [Set CSP back to disabled by default](gitlab-org/gitlab@f8f2dbf229693e20171185ae8e31fd59ce2131b3) ([merge request](gitlab-org/gitlab!63393))
+- [Fix CSP issues related to captchas](gitlab-org/gitlab@cec54814460994ea40311f1091fb7f091d04964f) ([merge request](gitlab-org/gitlab!63393))
+- [Fix issue with frames not loading in Safari](gitlab-org/gitlab@77b9355f244370b1c184943581f3b6cc27495931) ([merge request](gitlab-org/gitlab!63393))
+- [Catch PgQuery::ParseError errors and log as-is](gitlab-org/gitlab@a4f36df3701208b5d015e1e818f3d5be3577697a) ([merge request](gitlab-org/gitlab!62795))
+
+### Changed (1 change)
+
+- [Improve SSH key expiration warning emails](gitlab-org/gitlab@2e3929503046ab1da5635ef295321ce08843f937) ([merge request](gitlab-org/gitlab!63393))
+
## 13.12.2 (2021-06-01)
### Security (11 changes)
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index d786287fbde..975d54d8fc8 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-13.12.2 \ No newline at end of file
+13.12.3 \ No newline at end of file