Add latest changes from gitlab-org/gitlab@master

2 files changed, 5 insertions, 5 deletions

diff --git a/app/mailers/abuse_report_mailer.rb b/app/mailers/abuse_report_mailer.rb
index 20aabb6fe58..1fa85064c57 100644
--- a/app/mailers/abuse_report_mailer.rb
+++ b/app/mailers/abuse_report_mailer.rb
@@ -11,8 +11,8 @@ class AbuseReportMailer < ApplicationMailer
     @abuse_report = AbuseReport.find(abuse_report_id)
 
     mail(
-      to:       Gitlab::CurrentSettings.abuse_notification_email,
-      subject:  "#{@abuse_report.user.name} (#{@abuse_report.user.username}) was reported for abuse"
+      to: Gitlab::CurrentSettings.abuse_notification_email,
+      subject: "#{@abuse_report.user.name} (#{@abuse_report.user.username}) was reported for abuse"
     )
   end
 
diff --git a/app/mailers/emails/projects.rb b/app/mailers/emails/projects.rb
index ed3fa28b15f..5b8471abb0f 100644
--- a/app/mailers/emails/projects.rb
+++ b/app/mailers/emails/projects.rb
@@ -51,9 +51,9 @@ module Emails
       add_project_headers
       headers['X-GitLab-Author'] = @message.author_username
 
-      mail(from:      sender(@message.author_id, send_from_user_email: @message.send_from_committer_email?),
-           reply_to:  @message.reply_to,
-           subject:   @message.subject)
+      mail(from: sender(@message.author_id, send_from_user_email: @message.send_from_committer_email?),
+           reply_to: @message.reply_to,
+           subject: @message.subject)
     end
 
     def prometheus_alert_fired_email(project, user, alert)