Merge commit 'ab85f59c30' into kb_migration

2023-03-17 09:39:40 +09:00 · 2023-03-17 09:39:40 +09:00 · c8a0050660
commit c8a0050660
parent d6008cffb5 ab85f59c30
30 changed files with 321 additions and 63 deletions
--- a/app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb
+++ b/app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb
@ -52,7 +52,7 @@ module Settings
            end
          else
            flash[:error] = I18n.t('webauthn_credentials.create.error')
-            status = :internal_server_error
+            status = :unprocessable_entity
          end
        else
          flash[:error] = t('webauthn_credentials.create.error')