Skip to content

GitLab Next

Why GitLab
Pricing
Contact Sales
Explore

Sign in
Get free trial

Primary navigation

Project

GitLab
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

be97241a

Commit be97241a authored 5 years ago by Mike Kozono

Downloads
- Plain Diff

Merge branch 'oauth_bypass_two_factor' into 'master'

Add option to allow OAuth providers to bypass two factor

Closes #56059

See merge request gitlab-org/gitlab-ce!31996

parents 5e59c919 6e2032f2

No related branches found

No related tags found

Loading

Changes 7

Show whitespace changes

Inline Side-by-side

Showing

changelogs/unreleased/oauth_bypass_two_factor.yml 5 additions, 0 deletions

changelogs/unreleased/oauth_bypass_two_factor.yml
config/gitlab.yml.example 8 additions, 0 deletions

config/gitlab.yml.example
config/initializers/1_settings.rb 1 addition, 0 deletions

config/initializers/1_settings.rb
doc/integration/omniauth.md 20 additions, 0 deletions

doc/integration/omniauth.md
lib/gitlab/auth/o_auth/user.rb 6 additions, 1 deletion

lib/gitlab/auth/o_auth/user.rb
spec/features/oauth_login_spec.rb 12 additions, 0 deletions

spec/features/oauth_login_spec.rb
spec/lib/gitlab/auth/o_auth/user_spec.rb 18 additions, 4 deletions

spec/lib/gitlab/auth/o_auth/user_spec.rb

with 70 additions and 5 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment