diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-05 23:11:43 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-05 23:11:43 +0000 |
commit | 13d327df4f3c52505bf8ec1144f2dedb6a351ad6 (patch) | |
tree | 546e42fe159cde302b5e4d0b923d399e79bfbf71 /changelogs | |
parent | 9a70fcd2e277721bbe7b9a0c92ed925ddea201b6 (diff) | |
download | gitlab-ce-13d327df4f3c52505bf8ec1144f2dedb6a351ad6.tar.gz |
Add latest changes from gitlab-org/gitlab@13-9-stable-ee
Diffstat (limited to 'changelogs')
4 files changed, 20 insertions, 0 deletions
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 new file mode 100644 index 00000000000..e5c9eeae035 --- /dev/null +++ b/changelogs/unreleased/322861-outdated-asciidoctor-kroki-gem-with-spelling-mistake-for-wavedrom.yml @@ -0,0 +1,5 @@ +--- +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 new file mode 100644 index 00000000000..36d3730448a --- /dev/null +++ b/changelogs/unreleased/322991-asset_proxy_allowlist-errors-in-13-9-for-geo-with-downtime-upgrade.yml @@ -0,0 +1,5 @@ +--- +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 new file mode 100644 index 00000000000..fef8885c0a8 --- /dev/null +++ b/changelogs/unreleased/sh-bump-gitlab-shell-version.yml @@ -0,0 +1,5 @@ +--- +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 new file mode 100644 index 00000000000..7c5f3d210ae --- /dev/null +++ b/changelogs/unreleased/sh-fix-kroki-format-filtering.yml @@ -0,0 +1,5 @@ +--- +title: Fix disabling of Kroki optional formats +merge_request: 55665 +author: +type: fixed |