Merge commit 'ffeb5da9912a3b7db0deb8aec429e661ef609c59' into glitch-soc/merge-upstream

2025-12-20 13:48:09 +00:00 · 2025-08-05 15:46:33 +02:00
parent 98685f744d ffeb5da991
commit 3f166bb068
68 changed files with 192 additions and 24 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 = :unprocessable_entity
+            status = :unprocessable_content
          end
        else
          flash[:error] = t('webauthn_credentials.create.error')