From 625244bd6496fe0bd6a30798e86cf2f0fbadc77e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me> Date: Wed, 19 Dec 2018 11:56:07 +0100 Subject: [PATCH] Move all the prepend in mailers to bottom MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: R茅my Coutable <remy@rymai.me> --- app/mailers/emails/merge_requests.rb | 4 ++-- app/mailers/emails/notes.rb | 4 ++-- app/mailers/emails/projects.rb | 4 ++-- app/mailers/notify.rb | 4 ++-- .../{emails/ee => ee/emails}/merge_requests.rb | 10 +++++----- ee/app/mailers/{emails/ee => ee/emails}/notes.rb | 6 ++---- .../mailers/{emails/ee => ee/emails}/projects.rb | 16 ++++++++-------- .../ee => ee/emails}/merge_requests_spec.rb | 2 +- 8 files changed, 24 insertions(+), 26 deletions(-) rename ee/app/mailers/{emails/ee => ee/emails}/merge_requests.rb (83%) rename ee/app/mailers/{emails/ee => ee/emails}/notes.rb (84%) rename ee/app/mailers/{emails/ee => ee/emails}/projects.rb (79%) rename ee/spec/mailers/{emails/ee => ee/emails}/merge_requests_spec.rb (97%) diff --git a/app/mailers/emails/merge_requests.rb b/app/mailers/emails/merge_requests.rb index b2301b88bb4..1ab45e478bf 100644 --- a/app/mailers/emails/merge_requests.rb +++ b/app/mailers/emails/merge_requests.rb @@ -2,8 +2,6 @@ module Emails module MergeRequests - prepend Emails::EE::MergeRequests # rubocop: disable Cop/InjectEnterpriseEditionModule - def new_merge_request_email(recipient_id, merge_request_id, reason = nil) setup_merge_request_mail(merge_request_id, recipient_id, present: true) @@ -115,3 +113,5 @@ module Emails end end end + +Emails::MergeRequests.prepend(EE::Emails::MergeRequests) diff --git a/app/mailers/emails/notes.rb b/app/mailers/emails/notes.rb index 1593def786c..a6773f53a61 100644 --- a/app/mailers/emails/notes.rb +++ b/app/mailers/emails/notes.rb @@ -2,8 +2,6 @@ module Emails module Notes - prepend Emails::EE::Notes # rubocop: disable Cop/InjectEnterpriseEditionModule - def note_commit_email(recipient_id, note_id) setup_note_mail(note_id, recipient_id) @@ -70,3 +68,5 @@ module Emails end end end + +Emails::Notes.prepend(EE::Emails::Notes) diff --git a/app/mailers/emails/projects.rb b/app/mailers/emails/projects.rb index 1aa5c709383..92176f17676 100644 --- a/app/mailers/emails/projects.rb +++ b/app/mailers/emails/projects.rb @@ -2,8 +2,6 @@ module Emails module Projects - prepend Emails::EE::Projects # rubocop: disable Cop/InjectEnterpriseEditionModule - def project_was_moved_email(project_id, user_id, old_path_with_namespace) @current_user = @user = User.find user_id @project = Project.find project_id @@ -59,3 +57,5 @@ module Emails end end end + +Emails::Projects.prepend(EE::Emails::Projects) diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb index 2e885183307..777000073b3 100644 --- a/app/mailers/notify.rb +++ b/app/mailers/notify.rb @@ -1,8 +1,6 @@ # frozen_string_literal: true class Notify < BaseMailer - prepend ::EE::Notify # rubocop: disable Cop/InjectEnterpriseEditionModule - include ActionDispatch::Routing::PolymorphicRoutes include GitlabRoutingHelper include EmailsHelper @@ -212,3 +210,5 @@ class Notify < BaseMailer @unsubscribe_url = unsubscribe_sent_notification_url(@sent_notification) end end + +Notify.prepend(EE::Notify) diff --git a/ee/app/mailers/emails/ee/merge_requests.rb b/ee/app/mailers/ee/emails/merge_requests.rb similarity index 83% rename from ee/app/mailers/emails/ee/merge_requests.rb rename to ee/app/mailers/ee/emails/merge_requests.rb index 7a51411e16f..cf76efd7f71 100644 --- a/ee/app/mailers/emails/ee/merge_requests.rb +++ b/ee/app/mailers/ee/emails/merge_requests.rb @@ -1,26 +1,26 @@ # frozen_string_literal: true -module Emails - module EE +module EE + module Emails module MergeRequests def add_merge_request_approver_email(recipient_id, merge_request_id, updated_by_user_id, reason = nil) setup_merge_request_mail(merge_request_id, recipient_id, present: true) - @updated_by = User.find(updated_by_user_id) + @updated_by = ::User.find(updated_by_user_id) mail_answer_thread(@merge_request, merge_request_thread_options(updated_by_user_id, recipient_id, reason)) end def approved_merge_request_email(recipient_id, merge_request_id, approved_by_user_id, reason = nil) setup_merge_request_mail(merge_request_id, recipient_id) - @approved_by = User.find(approved_by_user_id) + @approved_by = ::User.find(approved_by_user_id) mail_answer_thread(@merge_request, merge_request_thread_options(approved_by_user_id, recipient_id, reason)) end def unapproved_merge_request_email(recipient_id, merge_request_id, unapproved_by_user_id, reason = nil) setup_merge_request_mail(merge_request_id, recipient_id) - @unapproved_by = User.find(unapproved_by_user_id) + @unapproved_by = ::User.find(unapproved_by_user_id) mail_answer_thread(@merge_request, merge_request_thread_options(unapproved_by_user_id, recipient_id, reason)) end end diff --git a/ee/app/mailers/emails/ee/notes.rb b/ee/app/mailers/ee/emails/notes.rb similarity index 84% rename from ee/app/mailers/emails/ee/notes.rb rename to ee/app/mailers/ee/emails/notes.rb index ef831ffe6df..20ed3ee4b56 100644 --- a/ee/app/mailers/emails/ee/notes.rb +++ b/ee/app/mailers/ee/emails/notes.rb @@ -1,10 +1,8 @@ # frozen_string_literal: true -module Emails - module EE +module EE + module Emails module Notes - extend ::Gitlab::Utils::Override - def note_epic_email(recipient_id, note_id) setup_note_mail(note_id, recipient_id) diff --git a/ee/app/mailers/emails/ee/projects.rb b/ee/app/mailers/ee/emails/projects.rb similarity index 79% rename from ee/app/mailers/emails/ee/projects.rb rename to ee/app/mailers/ee/emails/projects.rb index 60e693e7988..dd1c47975fc 100644 --- a/ee/app/mailers/emails/ee/projects.rb +++ b/ee/app/mailers/ee/emails/projects.rb @@ -1,20 +1,20 @@ # frozen_string_literal: true -module Emails - module EE +module EE + module Emails module Projects def mirror_was_hard_failed_email(project_id, user_id) - @project = Project.find(project_id) - user = User.find(user_id) + @project = ::Project.find(project_id) + user = ::User.find(user_id) mail(to: user.notification_email, subject: subject('Repository mirroring paused')) end def project_mirror_user_changed_email(new_mirror_user_id, deleted_user_name, project_id) - @project = Project.find(project_id) + @project = ::Project.find(project_id) @deleted_user_name = deleted_user_name - new_mirror_user = User.find(new_mirror_user_id) + new_mirror_user = ::User.find(new_mirror_user_id) mail(to: new_mirror_user.notification_email, subject: subject('Mirror user changed')) @@ -24,7 +24,7 @@ module Emails def prometheus_alert_fired_email(project_id, user_id, alert_params) alert_metric_id = alert_params["labels"]["gitlab_alert_id"] - @project = Project.find_by(id: project_id) + @project = ::Project.find_by(id: project_id) return unless @project @alert = @project.prometheus_alerts.find_by(prometheus_metric: alert_metric_id) @@ -32,7 +32,7 @@ module Emails @environment = @alert.environment - user = User.find_by(id: user_id) + user = ::User.find_by(id: user_id) return unless user subject_text = "Alert: #{@environment.name} - #{@alert.title} #{@alert.computed_operator} #{@alert.threshold} for 5 minutes" diff --git a/ee/spec/mailers/emails/ee/merge_requests_spec.rb b/ee/spec/mailers/ee/emails/merge_requests_spec.rb similarity index 97% rename from ee/spec/mailers/emails/ee/merge_requests_spec.rb rename to ee/spec/mailers/ee/emails/merge_requests_spec.rb index 6eb1ed20795..b83e452948d 100644 --- a/ee/spec/mailers/emails/ee/merge_requests_spec.rb +++ b/ee/spec/mailers/ee/emails/merge_requests_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' require 'email_spec' -describe Emails::EE::MergeRequests do +describe EE::Emails::MergeRequests do include EmailSpec::Matchers let(:user) { create(:user) } -- 2.30.9