Merge commit '3a4d3e9d4b573c400eec1743471d54cdccae50a5' into glitch-soc/merge-upstream

2023-08-12 09:36:38 +02:00
parent 150cfcf3ae 3a4d3e9d4b
commit ea8802a05a
23 changed files with 198 additions and 20 deletions
--- a/app/views/auth/setup/show.html.haml
+++ b/app/views/auth/setup/show.html.haml
@ -17,6 +17,6 @@
    = f.input :email, required: true, hint: false, input_html: { 'aria-label': t('simple_form.labels.defaults.email'), autocomplete: 'off' }

  .actions
-    = f.submit t('auth.resend_confirmation'), class: 'button'
+    = f.button :button, t('auth.resend_confirmation'), type: :submit, class: 'button timer-button', disabled: true

 .form-footer= render 'auth/shared/links'