diff options
7 files changed, 15 insertions, 30 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 62336f79533..646c63e3fd1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,21 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 13.2.1 (2020-07-23) + +### Fixed (4 changes) + +- Resolve Pasting an image into a comment also uploads design. !37171 +- Fix merge request approvals for EE without a license. !37246 +- Fix local Tiller not being default-enabled on the frontend. !37494 +- Fix missing path for avatars of bots. !37671 + +### Changed (2 changes) + +- Limit database deprecation notice window. !37009 +- Shorten 'enable LFS' manage for design management. !37385 + + ## 13.2.0 (2020-07-22) ### Security (3 changes) diff --git a/changelogs/unreleased/229588-pasting-an-image-into-a-comment-also-uploads-design.yml b/changelogs/unreleased/229588-pasting-an-image-into-a-comment-also-uploads-design.yml deleted file mode 100644 index 279f0386f7f..00000000000 --- a/changelogs/unreleased/229588-pasting-an-image-into-a-comment-also-uploads-design.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Resolve Pasting an image into a comment also uploads design -merge_request: 37171 -author: -type: fixed diff --git a/changelogs/unreleased/231251-error-500-in-service-desk-due-missing-asset.yml b/changelogs/unreleased/231251-error-500-in-service-desk-due-missing-asset.yml deleted file mode 100644 index ab0dc71c00c..00000000000 --- a/changelogs/unreleased/231251-error-500-in-service-desk-due-missing-asset.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix missing path for avatars of bots -merge_request: 37671 -author: -type: fixed diff --git a/changelogs/unreleased/design-management-shorter-lfs-msg.yml b/changelogs/unreleased/design-management-shorter-lfs-msg.yml deleted file mode 100644 index 8f052426a35..00000000000 --- a/changelogs/unreleased/design-management-shorter-lfs-msg.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Shorten 'enable LFS' manage for design management -merge_request: 37385 -author: -type: changed diff --git a/changelogs/unreleased/fix-local-tiller-default-enabled.yml b/changelogs/unreleased/fix-local-tiller-default-enabled.yml deleted file mode 100644 index d9753bc320c..00000000000 --- a/changelogs/unreleased/fix-local-tiller-default-enabled.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix local Tiller not being default-enabled on the frontend -merge_request: 37494 -author: -type: fixed diff --git a/changelogs/unreleased/id-fix-approvals-for-ee-without-license.yml b/changelogs/unreleased/id-fix-approvals-for-ee-without-license.yml deleted file mode 100644 index 4d8d0158e65..00000000000 --- a/changelogs/unreleased/id-fix-approvals-for-ee-without-license.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix merge request approvals for EE without a license -merge_request: 37246 -author: -type: fixed diff --git a/changelogs/unreleased/limit-db-deprecation-notice-window.yml b/changelogs/unreleased/limit-db-deprecation-notice-window.yml deleted file mode 100644 index 351e6fba3d9..00000000000 --- a/changelogs/unreleased/limit-db-deprecation-notice-window.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Limit database deprecation notice window -merge_request: 37009 -author: -type: changed |