summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-02-09 15:02:11 +0000
committerJames Lopez <james@jameslopez.es>2018-03-07 13:36:43 +0100
commit6deed66eda567d572c31bcbf5c6a3fcda8301cee (patch)
treeea8779c8aad584d59947a7ed98ceeb0c5e543ea3 /changelogs
parent5d1297098593aeda31ea2c1b1b0f6f303e45f135 (diff)
downloadgitlab-ce-6deed66eda567d572c31bcbf5c6a3fcda8301cee.tar.gz
Merge branch 'sh-fix-otp-backup-invalidation-10-5' into 'security-10-5'
Ensure that OTP backup codes are always invalidated - 10.5 port See merge request gitlab/gitlabhq!2324
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/sh-fix-otp-backup-code-invalidation.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/sh-fix-otp-backup-code-invalidation.yml b/changelogs/unreleased/sh-fix-otp-backup-code-invalidation.yml
new file mode 100644
index 00000000000..cedb09c9a7a
--- /dev/null
+++ b/changelogs/unreleased/sh-fix-otp-backup-code-invalidation.yml
@@ -0,0 +1,5 @@
+---
+title: Ensure that OTP backup codes are always invalidated
+merge_request:
+author:
+type: security