From cd372429a0d6cced2185c13aa25599d3d93d8ee7 Mon Sep 17 00:00:00 2001 From: Eito Katagiri Date: Tue, 27 Sep 2022 22:30:56 +0900 Subject: [PATCH] inherit ApplicationMailer instead --- .rubocop_todo.yml | 4 ---- app/mailers/application_mailer.rb | 4 ++++ app/mailers/notifications.rb | 2 +- app/mailers/reminders.rb | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 app/mailers/application_mailer.rb diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index eb3d8de73..9fa595da3 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -25,10 +25,6 @@ Rails/ActiveRecordCallbacksOrder: Rails/ApplicationController: Exclude: - app/controllers/api_docs_controller.rb -Rails/ApplicationMailer: - Exclude: - - app/mailers/notifications.rb - - app/mailers/reminders.rb Rails/ApplicationRecord: Exclude: - app/models/admin.rb diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 000000000..26148f2d6 --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +# frozen_string_literal: true + +class ApplicationMailer < ActionMailer::Base +end diff --git a/app/mailers/notifications.rb b/app/mailers/notifications.rb index d228e6d64..49616c50b 100644 --- a/app/mailers/notifications.rb +++ b/app/mailers/notifications.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class Notifications < ActionMailer::Base +class Notifications < ApplicationMailer default from: 'api-notifications@safecast.org' default_url_options[:locale] = 'en-US' diff --git a/app/mailers/reminders.rb b/app/mailers/reminders.rb index ad130d974..e6b4c435f 100644 --- a/app/mailers/reminders.rb +++ b/app/mailers/reminders.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class Reminders < ActionMailer::Base +class Reminders < ApplicationMailer default from: 'mailer@safecast.org' default_url_options[:locale] = 'en-US'