meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-01-04 06:39:38 +00:00
Code Issues Releases Wiki Activity

Prevent clash with Rails 5.1 Mailer class.

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@16600 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2017-06-03 08:20:20 +00:00
parent 1870a2e4fb
commit 99a714e39b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/mail_handler.rb
View File

@ -130,7 +130,7 @@ class MailHandler < ActionMailer::Base
end
add_user_to_group(handler_options[:default_group])
unless handler_options[:no_account_notice]
Mailer.account_information(@user, @user.password).deliver
::Mailer.account_information(@user, @user.password).deliver
end
else
if logger

8
app/models/mailer.rb
View File

@ -61,7 +61,7 @@ class Mailer < ActionMailer::Base
to = issue.notified_users
cc = issue.notified_watchers - to
issue.each_notification(to + cc) do |users|
Mailer.issue_add(issue, to & users, cc & users).deliver
issue_add(issue, to & users, cc & users).deliver
end
end
@ -95,7 +95,7 @@ class Mailer < ActionMailer::Base
cc = journal.notified_watchers - to
journal.each_notification(to + cc) do |users|
issue.each_notification(users) do |users2|
Mailer.issue_edit(journal, to & users2, cc & users2).deliver
issue_edit(journal, to & users2, cc & users2).deliver
end
end
end
@ -317,7 +317,7 @@ class Mailer < ActionMailer::Base
# TODO: maybe not the best way to handle this
return if user.admin? && user.login == 'admin' && user.mail == 'admin@example.net'
Mailer.security_notification(user,
security_notification(user,
message: :mail_body_password_updated,
title: :button_change_password,
url: {controller: 'my', action: 'password'}
@ -359,7 +359,7 @@ class Mailer < ActionMailer::Base
return unless changes.present?
users = User.active.where(admin: true).to_a
Mailer.settings_updated(users, changes).deliver
settings_updated(users, changes).deliver
end
def test_email(user)