diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-07-23 10:17:06 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-07-23 10:51:07 +0200 |
commit | 444796b69b0cd2c7b4b95d3b3119e0b7a503f682 (patch) | |
tree | 6607b9d27817f66a1395bcfaea609198015f8973 /app/views/auth/confirmations/finish_signup.html.haml | |
parent | 6db5669818cce459b9bb916665541b7b8f5d5155 (diff) | |
parent | ab3126e7a23125b033ec198cfd83c2178338442c (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/application_controller.rb - app/controllers/auth/confirmations_controller.rb - app/controllers/auth/sessions_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
Diffstat (limited to 'app/views/auth/confirmations/finish_signup.html.haml')
-rw-r--r-- | app/views/auth/confirmations/finish_signup.html.haml | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/app/views/auth/confirmations/finish_signup.html.haml b/app/views/auth/confirmations/finish_signup.html.haml deleted file mode 100644 index 9d09b74e1..000000000 --- a/app/views/auth/confirmations/finish_signup.html.haml +++ /dev/null @@ -1,15 +0,0 @@ -- content_for :page_title do - = t('auth.confirm_email') - -= simple_form_for(current_user, as: 'user', url: finish_signup_path, html: { role: 'form'}) do |f| - - if @show_errors && current_user.errors.any? - #error_explanation - - current_user.errors.full_messages.each do |msg| - = msg - %br - - .fields-group - = f.input :email, wrapper: :with_label, required: true, hint: false - - .actions - = f.submit t('auth.confirm_email'), class: 'button' |