Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

G

go-sso
- Activity
- Members
- Labels
- Releases
- Model registry
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

4192fb32

Commit 4192fb32 authored 6 years ago by ale

Downloads
- Plain Diff

Merge branch 'switch-2fa' into 'master'

Let the user pick 2FA method

See merge request !2

parents 8ed88638 230ae972

Branches

No related tags found

1 merge request!2Let the user pick 2FA method

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

server/bindata.go 18 additions, 2 deletions

server/bindata.go
server/http_test.go 2 additions, 2 deletions

server/http_test.go
server/login.go 48 additions, 22 deletions

server/login.go
server/templates/login_otp.html 8 additions, 0 deletions

server/templates/login_otp.html
server/templates/login_u2f.html 8 additions, 0 deletions

server/templates/login_u2f.html
vendor/git.autistici.org/id/auth/README.md 146 additions, 20 deletions

vendor/git.autistici.org/id/auth/README.md
vendor/git.autistici.org/id/auth/protocol.go 67 additions, 26 deletions

vendor/git.autistici.org/id/auth/protocol.go
vendor/vendor.json 5 additions, 5 deletions

vendor/vendor.json

with 302 additions and 77 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