summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2018-03-01 15:56:24 -0600
committerRobert Speicher <rspeicher@gmail.com>2018-03-01 15:56:24 -0600
commit1efc1b005f415b0237dc07a796d7d4507dcfdb43 (patch)
tree96df9a34ca29f47dc95c0d2fec202c6abcab7777
parent070cb7eecd99a1a855a1d0d6e3bed8f8c6caa7d8 (diff)
downloadgitlab-ce-1efc1b005f415b0237dc07a796d7d4507dcfdb43.tar.gz
Update CHANGELOG.md for 10.3.8
[ci skip]
-rw-r--r--CHANGELOG.md7
-rw-r--r--changelogs/unreleased/sh-fix-otp-backup-code-invalidation.yml5
2 files changed, 7 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa64973207c..957983193d7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 10.3.8 (2018-03-01)
+
+### Security (1 change)
+
+- Ensure that OTP backup codes are always invalidated.
+
+
## 10.3.7 (2018-02-05)
### Security (4 changes)
diff --git a/changelogs/unreleased/sh-fix-otp-backup-code-invalidation.yml b/changelogs/unreleased/sh-fix-otp-backup-code-invalidation.yml
deleted file mode 100644
index cedb09c9a7a..00000000000
--- a/changelogs/unreleased/sh-fix-otp-backup-code-invalidation.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Ensure that OTP backup codes are always invalidated
-merge_request:
-author:
-type: security