From 250d11492ce80c5d4facb56e429cde37a9e1886f Mon Sep 17 00:00:00 2001 From: GitLab Release Tools Bot Date: Wed, 29 Jul 2020 20:33:56 +0000 Subject: Update CHANGELOG.md for 13.2.2 [ci skip] --- CHANGELOG.md | 13 +++++++++++++ ...g-unconfirm-migration-when-email-confirmation-is-off.yml | 5 ----- .../unreleased/cngo-fix-jira-import-users-startat.yml | 5 ----- .../jc-coerce-repository-storages-weighted-api.yml | 5 ----- .../show-email-unconfirmed-message-in-git-auth.yml | 5 ----- 5 files changed, 13 insertions(+), 20 deletions(-) delete mode 100644 changelogs/unreleased/232534-skip-running-unconfirm-migration-when-email-confirmation-is-off.yml delete mode 100644 changelogs/unreleased/cngo-fix-jira-import-users-startat.yml delete mode 100644 changelogs/unreleased/jc-coerce-repository-storages-weighted-api.yml delete mode 100644 changelogs/unreleased/show-email-unconfirmed-message-in-git-auth.yml diff --git a/CHANGELOG.md b/CHANGELOG.md index 646c63e3fd1..996f149c6fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,19 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 13.2.2 (2020-07-29) + +### Fixed (3 changes) + +- Coerce repository_storages_weighted, removes repository_storages. !36376 +- Fix JiraImportUsersInput startAt field. !37492 +- Provide better git error message when the user is unconfirmed. !37944 + +### Changed (1 change) + +- Skip mass unconfirming users when send_user_confirmation_email setting is off. !38024 + + ## 13.2.1 (2020-07-23) ### Fixed (4 changes) diff --git a/changelogs/unreleased/232534-skip-running-unconfirm-migration-when-email-confirmation-is-off.yml b/changelogs/unreleased/232534-skip-running-unconfirm-migration-when-email-confirmation-is-off.yml deleted file mode 100644 index 32103993d2a..00000000000 --- a/changelogs/unreleased/232534-skip-running-unconfirm-migration-when-email-confirmation-is-off.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Skip mass unconfirming users when send_user_confirmation_email setting is off -merge_request: 38024 -author: -type: changed diff --git a/changelogs/unreleased/cngo-fix-jira-import-users-startat.yml b/changelogs/unreleased/cngo-fix-jira-import-users-startat.yml deleted file mode 100644 index 91015072097..00000000000 --- a/changelogs/unreleased/cngo-fix-jira-import-users-startat.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix JiraImportUsersInput startAt field -merge_request: 37492 -author: -type: fixed diff --git a/changelogs/unreleased/jc-coerce-repository-storages-weighted-api.yml b/changelogs/unreleased/jc-coerce-repository-storages-weighted-api.yml deleted file mode 100644 index 1784471d1ac..00000000000 --- a/changelogs/unreleased/jc-coerce-repository-storages-weighted-api.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Coerce repository_storages_weighted, removes repository_storages -merge_request: 36376 -author: -type: fixed diff --git a/changelogs/unreleased/show-email-unconfirmed-message-in-git-auth.yml b/changelogs/unreleased/show-email-unconfirmed-message-in-git-auth.yml deleted file mode 100644 index a6f4ed725e7..00000000000 --- a/changelogs/unreleased/show-email-unconfirmed-message-in-git-auth.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Provide better git error message when the user is unconfirmed -merge_request: 37944 -author: -type: fixed -- cgit v1.2.3