diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-05-07 19:51:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-07 19:51:00 +0200 |
| commit | 50f8ee2e07e0a8a0ab8971543cb6544c8d6c5f5d (patch) | |
| tree | 2d0f4954a3077e3e0bb2d02f671af41b69672e2a /app/controllers/auth/confirmations_controller.rb | |
| parent | a346912030012dc1451249373ff7ef1a61016517 (diff) | |
| parent | e08b31a70624fe069d2f26bf2078a69e2d48f6aa (diff) | |
Merge pull request #1526 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/auth/confirmations_controller.rb')
| -rw-r--r-- | app/controllers/auth/confirmations_controller.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/auth/confirmations_controller.rb b/app/controllers/auth/confirmations_controller.rb index 4e89446c7..0b5a2f3c9 100644 --- a/app/controllers/auth/confirmations_controller.rb +++ b/app/controllers/auth/confirmations_controller.rb @@ -22,7 +22,9 @@ class Auth::ConfirmationsController < Devise::ConfirmationsController end def require_unconfirmed! - redirect_to edit_user_registration_path if user_signed_in? && current_user.confirmed? && current_user.unconfirmed_email.blank? + if user_signed_in? && current_user.confirmed? && current_user.unconfirmed_email.blank? + redirect_to(current_user.approved? ? root_path : edit_user_registration_path) + end end def set_body_classes |