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

2023-05-25 23:47:28 +02:00
parent 3b375ee395 e387175fc9
commit e2ab9d4dad
46 changed files with 570 additions and 303 deletions
--- a/app/views/auth/confirmations/captcha.html.haml
+++ b/app/views/auth/confirmations/captcha.html.haml
@ -5,6 +5,7 @@
  = render 'auth/shared/progress', stage: 'confirm'

  = hidden_field_tag :confirmation_token, params[:confirmation_token]
+  = hidden_field_tag :redirect_to_app, params[:redirect_to_app]

  %p.lead= t('auth.captcha_confirmation.hint_html')