diff options
author | Claire <claire.github-309c@sitedethib.com> | 2023-04-09 11:25:30 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-09 11:25:30 +0200 |
commit | ff168ef2024626f37fa776fde5739dcd58ecb9f2 (patch) | |
tree | 5b638b2e5a43445a75133a9b510bff00d44ea986 /app/controllers/auth/confirmations_controller.rb | |
parent | 29a91b871eb4fb375baa3701e29cfb35f884bb98 (diff) |
Fix most rubocop issues (#2165)
* Run rubocop --autocorrect on app/, config/ and lib/, also manually fix some remaining style issues * Run rubocop --autocorrect-all on db/ * Run rubocop --autocorrect-all on `spec/` and fix remaining issues
Diffstat (limited to 'app/controllers/auth/confirmations_controller.rb')
-rw-r--r-- | app/controllers/auth/confirmations_controller.rb | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/app/controllers/auth/confirmations_controller.rb b/app/controllers/auth/confirmations_controller.rb index 0817a905c..620fb621d 100644 --- a/app/controllers/auth/confirmations_controller.rb +++ b/app/controllers/auth/confirmations_controller.rb @@ -15,12 +15,6 @@ class Auth::ConfirmationsController < Devise::ConfirmationsController skip_before_action :require_functional! - def new - super - - resource.email = current_user.unconfirmed_email || current_user.email if user_signed_in? - end - def show old_session_values = session.to_hash reset_session @@ -29,6 +23,12 @@ class Auth::ConfirmationsController < Devise::ConfirmationsController super end + def new + super + + resource.email = current_user.unconfirmed_email || current_user.email if user_signed_in? + end + def confirm_captcha check_captcha! do |message| flash.now[:alert] = message @@ -51,6 +51,7 @@ class Auth::ConfirmationsController < Devise::ConfirmationsController # step. confirmation_token = params[:confirmation_token] return if confirmation_token.nil? + @confirmation_user = User.find_first_by_auth_conditions(confirmation_token: confirmation_token) end |