tarrien/Mastodon
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire committed 2021-08-27 11:29:03 +02:00
2 parents 70909c5b09 7283a5d3b9
commit 463d23dfd5
12 files changed
+255 -122
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb
+2 -1
View File
@@ -21,7 +21,8 @@ module Settings
display_name: current_user.account.username,
id: current_user.webauthn_id,
},
exclude: current_user.webauthn_credentials.pluck(:external_id)
exclude: current_user.webauthn_credentials.pluck(:external_id),
authenticator_selection: { user_verification: 'discouraged' }
)
session[:webauthn_challenge] = options_for_create.challenge