summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-03-08 09:12:12 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-03-08 09:12:12 +0000
commitea359c58edb6ff68a04f48ec231d11930f66c79a (patch)
treea41e118a9ca36fe9a009f47d37f081fb45d2460e
parentf8c7d51d9f78a766187887ac9613607b51845f73 (diff)
downloadgitlab-ce-ea359c58edb6ff68a04f48ec231d11930f66c79a.tar.gz
Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.3
-rw-r--r--CHANGELOG.md10
-rw-r--r--GITALY_SERVER_VERSION2
-rw-r--r--changelogs/unreleased/322861-outdated-asciidoctor-kroki-gem-with-spelling-mistake-for-wavedrom.yml5
-rw-r--r--changelogs/unreleased/322991-asset_proxy_allowlist-errors-in-13-9-for-geo-with-downtime-upgrade.yml5
-rw-r--r--changelogs/unreleased/sh-bump-gitlab-shell-version.yml5
-rw-r--r--changelogs/unreleased/sh-fix-kroki-format-filtering.yml5
6 files changed, 11 insertions, 21 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b5a038d9106..ce665eb7fcc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,16 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 13.9.3 (2021-03-08)
+
+### Fixed (4 changes)
+
+- Upgrade gitlab-shell to v13.17.0. !55295
+- Update Kroki to fix Wavedrom graphs. !55659
+- Fix disabling of Kroki optional formats. !55665
+- Rename asset_proxy_allowlist column. !55884
+
+
## 13.9.2 (2021-03-04)
### Security (6 changes)
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index 8b723ee01f4..353780b610a 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-13.9.2 \ No newline at end of file
+13.9.3 \ No newline at end of file
diff --git a/changelogs/unreleased/322861-outdated-asciidoctor-kroki-gem-with-spelling-mistake-for-wavedrom.yml b/changelogs/unreleased/322861-outdated-asciidoctor-kroki-gem-with-spelling-mistake-for-wavedrom.yml
deleted file mode 100644
index e5c9eeae035..00000000000
--- a/changelogs/unreleased/322861-outdated-asciidoctor-kroki-gem-with-spelling-mistake-for-wavedrom.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Update Kroki to fix Wavedrom graphs
-merge_request: 55659
-author:
-type: fixed
diff --git a/changelogs/unreleased/322991-asset_proxy_allowlist-errors-in-13-9-for-geo-with-downtime-upgrade.yml b/changelogs/unreleased/322991-asset_proxy_allowlist-errors-in-13-9-for-geo-with-downtime-upgrade.yml
deleted file mode 100644
index 36d3730448a..00000000000
--- a/changelogs/unreleased/322991-asset_proxy_allowlist-errors-in-13-9-for-geo-with-downtime-upgrade.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Rename asset_proxy_allowlist column
-merge_request: 55884
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-bump-gitlab-shell-version.yml b/changelogs/unreleased/sh-bump-gitlab-shell-version.yml
deleted file mode 100644
index fef8885c0a8..00000000000
--- a/changelogs/unreleased/sh-bump-gitlab-shell-version.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Upgrade gitlab-shell to v13.17.0
-merge_request: 55295
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-fix-kroki-format-filtering.yml b/changelogs/unreleased/sh-fix-kroki-format-filtering.yml
deleted file mode 100644
index 7c5f3d210ae..00000000000
--- a/changelogs/unreleased/sh-fix-kroki-format-filtering.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix disabling of Kroki optional formats
-merge_request: 55665
-author:
-type: fixed