diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2017-06-03 08:20:20 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2017-06-03 08:20:20 +0000 |
| commit | 99a714e39bd47fff8f02629965fea17948c37217 (patch) | |
| tree | 123026394e8aef30fda654f1488ffaf0b2639a7b /app/models/mailer.rb | |
| parent | 1870a2e4fb7ba83e856ec85f62675c3c649d1e86 (diff) | |
| download | redmine-99a714e39bd47fff8f02629965fea17948c37217.tar.gz redmine-99a714e39bd47fff8f02629965fea17948c37217.zip | |
Prevent clash with Rails 5.1 Mailer class.
git-svn-id: http://svn.redmine.org/redmine/trunk@16600 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models/mailer.rb')
| -rw-r--r-- | app/models/mailer.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/models/mailer.rb b/app/models/mailer.rb index f6b16b9f2..838eefe53 100644 --- a/app/models/mailer.rb +++ b/app/models/mailer.rb @@ -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) |