Merge remote-tracking branch 'origin/release/7.4' into dev

7 years ago · 3365793e5a
parent 739b104768 58a348e1ee
commit 3365793e5a
1 changed files with 3 additions and 0 deletions
--- a/app/controllers/two_factor_authentication/my/two_factor_devices_controller.rb
+++ b/app/controllers/two_factor_authentication/my/two_factor_devices_controller.rb
@ -16,6 +16,9 @@ module ::TwoFactorAuthentication
      before_action :check_password_confirmation,
                    only: [:make_default, :destroy]
      # Delete remember token on destroy
      before_action :clear_remember_token!, only: [:destroy]
      layout 'my'
      menu_item :two_factor_authentication