From: Go MAEDA <maeda@farend.jp>
Date: Mon, 31 Aug 2020 08:29:44 +0000 (+0000)
Subject: Fix that Redmine::Twofa::Base raises ArgumentError in development mode (#1237, #33925).
X-Git-Tag: 4.2.0~812
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ddce44f490a41b909dbc2ab7e9c7d0a925aaa5b7;p=redmine.git

Fix that Redmine::Twofa::Base raises ArgumentError in development mode (#1237, #33925).


git-svn-id: http://svn.redmine.org/redmine/trunk@19995 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/lib/redmine/twofa/base.rb b/lib/redmine/twofa/base.rb
index e959aa930..4c9c140f9 100644
--- a/lib/redmine/twofa/base.rb
+++ b/lib/redmine/twofa/base.rb
@@ -53,7 +53,7 @@ module Redmine
       end
 
       def deliver_twofa_paired
-        Mailer.security_notification(
+        ::Mailer.security_notification(
           @user,
           User.current,
           {
@@ -82,7 +82,7 @@ module Redmine
       end
 
       def deliver_twofa_unpaired
-        Mailer.security_notification(
+        ::Mailer.security_notification(
           @user,
           User.current,
           {
@@ -114,7 +114,7 @@ module Redmine
         Token.where(user_id: @user.id).find_token('twofa_backup_code', code).try(:delete)
         # make sure the user using the backup code is the same it's been issued to
         return false unless @user.present? && @user == user_from_code
-        Mailer.security_notification(
+        ::Mailer.security_notification(
           @user,
           User.current,
           {
@@ -135,7 +135,7 @@ module Redmine
           token.update_columns value: Redmine::Utils.random_hex(6)
           tokens << token
         end
-        Mailer.security_notification(
+        ::Mailer.security_notification(
           @user,
           User.current,
           {