about summary refs log tree commit diff
path: root/app/controllers/settings/two_factor_authentication
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2023-03-16 23:09:53 +0100
committerGitHub <noreply@github.com>2023-03-16 23:09:53 +0100
commitf5daa20f2a90098c9d689c5ec9d95ce9887b3a33 (patch)
treea225407cb43edf3fa9d9ac0100021a380e11ff91 /app/controllers/settings/two_factor_authentication
parent6a0ed45aa3f11f0343a7be556b36b4d075ba08df (diff)
parent32418f0ff3e7f25ca67334585d6d8442b34cb4af (diff)
Merge pull request #2134 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/settings/two_factor_authentication')
-rw-r--r--app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb b/app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb
index 952c14e0b..5a9029a42 100644
--- 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')