diff options
| author | ThibG <thib@sitedethib.com> | 2019-07-21 00:53:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-21 00:53:28 +0200 |
| commit | f1597e1ab90b1fb291f16977877c6ca79bf89676 (patch) | |
| tree | 7cb8facbd66c2199e173d2fc897863108b1fb398 /app/controllers/settings/two_factor_authentication | |
| parent | 19c3a941e8ac53a6e1ab6e9c0aaadbc53dd0050f (diff) | |
| parent | 055450bc02732f654317096f56b03b77f5b84270 (diff) | |
Merge pull request #1158 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/settings/two_factor_authentication')
| -rw-r--r-- | app/controllers/settings/two_factor_authentication/confirmations_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/settings/two_factor_authentication/confirmations_controller.rb b/app/controllers/settings/two_factor_authentication/confirmations_controller.rb index 8518c61ee..363b32e17 100644 --- a/app/controllers/settings/two_factor_authentication/confirmations_controller.rb +++ b/app/controllers/settings/two_factor_authentication/confirmations_controller.rb @@ -11,7 +11,7 @@ module Settings def create if current_user.validate_and_consume_otp!(confirmation_params[:code]) - flash[:notice] = I18n.t('two_factor_authentication.enabled_success') + flash.now[:notice] = I18n.t('two_factor_authentication.enabled_success') current_user.otp_required_for_login = true @recovery_codes = current_user.generate_otp_backup_codes! diff --git a/app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb b/app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb index 94d1567f3..0555d61db 100644 --- a/app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb +++ b/app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb @@ -6,7 +6,7 @@ module Settings def create @recovery_codes = current_user.generate_otp_backup_codes! current_user.save! - flash[:notice] = I18n.t('two_factor_authentication.recovery_codes_regenerated') + flash.now[:notice] = I18n.t('two_factor_authentication.recovery_codes_regenerated') render :index end end |