summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authordodocat <jingqq5210@gmail.com>2019-08-27 03:46:32 +0000
committerMichael Kozono <mkozono@gmail.com>2019-08-27 03:46:32 +0000
commit6e2032f24e0428189f8c9fe9e296a9630277155e (patch)
tree79ed8e273c4ee80512a11ca1029cd20426625457 /changelogs
parent5e59c919d780441a5605d76e76ce63a69166464d (diff)
downloadgitlab-ce-6e2032f24e0428189f8c9fe9e296a9630277155e.tar.gz
Update docs and comments about saml with allow_bypass_two_factor
allow_bypass_two_factor configration dose not work with saml provider
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/oauth_bypass_two_factor.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/oauth_bypass_two_factor.yml b/changelogs/unreleased/oauth_bypass_two_factor.yml
new file mode 100644
index 00000000000..7261e65a9f3
--- /dev/null
+++ b/changelogs/unreleased/oauth_bypass_two_factor.yml
@@ -0,0 +1,5 @@
+---
+title: Add option to allow OAuth providers to bypass two factor
+merge_request: 31996
+author: Dodocat
+type: added