diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-28 00:08:47 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-28 00:08:47 +0300 |
| commit | e4ea43b2b85ad5f3115f00220601eb719705139a (patch) | |
| tree | 1888a43f802e45ebb8dfed59595a790807777c6f /app/mailers | |
| parent | 390582e118752426acf5cb25ec99103d312d891c (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/mailers')
| -rw-r--r-- | app/mailers/abuse_report_mailer.rb | 2 | ||||
| -rw-r--r-- | app/mailers/application_mailer.rb (renamed from app/mailers/base_mailer.rb) | 2 | ||||
| -rw-r--r-- | app/mailers/email_rejection_mailer.rb | 2 | ||||
| -rw-r--r-- | app/mailers/notify.rb | 2 | ||||
| -rw-r--r-- | app/mailers/repository_check_mailer.rb | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/app/mailers/abuse_report_mailer.rb b/app/mailers/abuse_report_mailer.rb index e0aa66e6de3..0f2f63b43f5 100644 --- a/app/mailers/abuse_report_mailer.rb +++ b/app/mailers/abuse_report_mailer.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class AbuseReportMailer < BaseMailer +class AbuseReportMailer < ApplicationMailer layout 'empty_mailer' helper EmailsHelper diff --git a/app/mailers/base_mailer.rb b/app/mailers/application_mailer.rb index 5fd209c4761..e0c95370072 100644 --- a/app/mailers/base_mailer.rb +++ b/app/mailers/application_mailer.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class BaseMailer < ActionMailer::Base +class ApplicationMailer < ActionMailer::Base around_action :render_with_default_locale helper ApplicationHelper diff --git a/app/mailers/email_rejection_mailer.rb b/app/mailers/email_rejection_mailer.rb index d743533b1bc..25721658285 100644 --- a/app/mailers/email_rejection_mailer.rb +++ b/app/mailers/email_rejection_mailer.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class EmailRejectionMailer < BaseMailer +class EmailRejectionMailer < ApplicationMailer layout 'empty_mailer' helper EmailsHelper diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb index 92939136de2..49eacc44519 100644 --- a/app/mailers/notify.rb +++ b/app/mailers/notify.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class Notify < BaseMailer +class Notify < ApplicationMailer include ActionDispatch::Routing::PolymorphicRoutes include GitlabRoutingHelper include EmailsHelper diff --git a/app/mailers/repository_check_mailer.rb b/app/mailers/repository_check_mailer.rb index aa56ba1828b..b8f990f26c8 100644 --- a/app/mailers/repository_check_mailer.rb +++ b/app/mailers/repository_check_mailer.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class RepositoryCheckMailer < BaseMailer +class RepositoryCheckMailer < ApplicationMailer # rubocop: disable CodeReuse/ActiveRecord layout 'empty_mailer' |