Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>2020-09-04 11:15:58 +0300
committerGitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>2020-09-04 11:15:58 +0300
commit8169db268999b02c080431dce933ba056cb3ac90 (patch)
tree3f9f95bd732e58e2feb12d42e26b0904ecfd631a
parent8b111ecce1651e5a82e265a9571158006a338101 (diff)
Update CHANGELOG.md for 13.1.11
[ci skip]
-rw-r--r--CHANGELOG.md8
-rw-r--r--changelogs/unreleased/cat-time-precision-2fa-ldap.yml5
-rw-r--r--changelogs/unreleased/sh-fix-backup-restore-race.yml5
3 files changed, 8 insertions, 10 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c68c900c6ba..a50b3c41cc1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 13.1.11 (2020-09-04)
+
+### Fixed (2 changes)
+
+- Fix ActiveRecord::IrreversibleOrderError during restore from backup. !40789
+- Update the 2FA user update check to account for rounding errors. !41327
+
+
## 13.1.10 (2020-09-02)
### Security (1 change)
diff --git a/changelogs/unreleased/cat-time-precision-2fa-ldap.yml b/changelogs/unreleased/cat-time-precision-2fa-ldap.yml
deleted file mode 100644
index dc2cdaa8632..00000000000
--- a/changelogs/unreleased/cat-time-precision-2fa-ldap.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Update the 2FA user update check to account for rounding errors
-merge_request: 41327
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-fix-backup-restore-race.yml b/changelogs/unreleased/sh-fix-backup-restore-race.yml
deleted file mode 100644
index ab5d4d8fcb0..00000000000
--- a/changelogs/unreleased/sh-fix-backup-restore-race.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix ActiveRecord::IrreversibleOrderError during restore from backup
-merge_request: 40789
-author:
-type: fixed