diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-01-15 22:17:48 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-01-15 22:17:48 -0600 |
| commit | 89a9d629f776a3a115c1e89ee4c13e8cbe7ae684 (patch) | |
| tree | c5da0f86e23fbd544dea6bcef124c41803c841ef /app/mailers | |
| parent | 0c7dc6c78123728a9a0a32e16c2ad524e76926c8 (diff) | |
| parent | 5276c0a0900a0886b59a8ead2346540aa381ea46 (diff) | |
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts: Gemfile.lock
Diffstat (limited to 'app/mailers')
| -rw-r--r-- | app/mailers/admin_mailer.rb | 4 | ||||
| -rw-r--r-- | app/mailers/application_mailer.rb | 2 | ||||
| -rw-r--r-- | app/mailers/notification_mailer.rb | 4 |
3 files changed, 8 insertions, 2 deletions
diff --git a/app/mailers/admin_mailer.rb b/app/mailers/admin_mailer.rb index fd9223533..a30468eb8 100644 --- a/app/mailers/admin_mailer.rb +++ b/app/mailers/admin_mailer.rb @@ -1,7 +1,9 @@ # frozen_string_literal: true class AdminMailer < ApplicationMailer - helper StreamEntriesHelper + layout 'plain_mailer' + + helper :stream_entries def new_report(recipient, report) @report = report diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb index 95b770ff1..683b60c86 100644 --- a/app/mailers/application_mailer.rb +++ b/app/mailers/application_mailer.rb @@ -2,7 +2,9 @@ class ApplicationMailer < ActionMailer::Base layout 'mailer' + helper :instance + helper :mailer protected diff --git a/app/mailers/notification_mailer.rb b/app/mailers/notification_mailer.rb index fd2b0649a..07992102d 100644 --- a/app/mailers/notification_mailer.rb +++ b/app/mailers/notification_mailer.rb @@ -1,7 +1,9 @@ # frozen_string_literal: true class NotificationMailer < ApplicationMailer - helper StreamEntriesHelper + layout 'plain_mailer' + + helper :stream_entries def mention(recipient, notification) @me = recipient |