summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>2020-07-29 20:33:56 +0000
committerGitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>2020-07-29 20:33:56 +0000
commit250d11492ce80c5d4facb56e429cde37a9e1886f (patch)
tree18468c361f893eee7cfc8bdff886a31c4ffefe24
parentafd369e8f79fa97827c5118d81d2240beebfae58 (diff)
downloadgitlab-ce-250d11492ce80c5d4facb56e429cde37a9e1886f.tar.gz
Update CHANGELOG.md for 13.2.2
[ci skip]
-rw-r--r--CHANGELOG.md13
-rw-r--r--changelogs/unreleased/232534-skip-running-unconfirm-migration-when-email-confirmation-is-off.yml5
-rw-r--r--changelogs/unreleased/cngo-fix-jira-import-users-startat.yml5
-rw-r--r--changelogs/unreleased/jc-coerce-repository-storages-weighted-api.yml5
-rw-r--r--changelogs/unreleased/show-email-unconfirmed-message-in-git-auth.yml5
5 files changed, 13 insertions, 20 deletions
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