diff options
| author | Go MAEDA <maeda@farend.jp> | 2021-02-02 07:15:08 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2021-02-02 07:15:08 +0000 |
| commit | 75b6cacb5d001bb7a4dd24904e47e1deef1ab847 (patch) | |
| tree | 18b97c3f25418b8da192cee9f9ec3036bf12a19e /app | |
| parent | 097e75987b0c9f2dc7334aa1c23a5b3ae8b29163 (diff) | |
| download | redmine-75b6cacb5d001bb7a4dd24904e47e1deef1ab847.tar.gz redmine-75b6cacb5d001bb7a4dd24904e47e1deef1ab847.zip | |
Fix redirect loop when both enabling two-factor authentication and changing password are required (#1237, #34618).
Patch by Go MAEDA.
git-svn-id: http://svn.redmine.org/redmine/trunk@20734 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/my_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb index 9083b1317..e74274a77 100644 --- a/app/controllers/my_controller.rb +++ b/app/controllers/my_controller.rb @@ -21,7 +21,7 @@ class MyController < ApplicationController self.main_menu = false before_action :require_login # let user change user's password when user has to - skip_before_action :check_password_change, :only => :password + skip_before_action :check_password_change, :check_twofa_activation, :only => :password accept_api_auth :account |