Commiting

app/mailers/admin_mailer.rb

@@ -3,7 +3,7 @@
 class AdminMailer < ApplicationMailer
   layout 'plain_mailer'
 
-  helper :stream_entries
+  helper :statuses
 
   def new_report(recipient, report)
     @report   = report
@@ -15,13 +15,4 @@ class AdminMailer < ApplicationMailer
     end
   end
 
-  def new_pending_account(recipient, user)
-    @account  = user.account
-    @me       = recipient
-    @instance = Rails.configuration.x.local_domain
-
-    locale_for_account(@me) do
-      mail to: @me.user_email, subject: I18n.t('admin_mailer.new_pending_account.subject', instance: @instance, username: @account.username)
-    end
-  end
 end

app/mailers/notification_mailer.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class NotificationMailer < ApplicationMailer
-  helper :stream_entries
+  helper :statuses
 
   add_template_helper RoutingHelper
 

app/mailers/user_mailer.rb

@@ -148,7 +148,7 @@ class UserMailer < Devise::Mailer
     I18n.with_locale(@resource.locale || I18n.default_locale) do
       mail to: @resource.email,
            subject: I18n.t("user_mailer.warning.subject.#{@warning.action}", acct: "@#{user.account.local_username_and_domain}"),
-           reply_to: Setting.site_contact_email
+           reply_to: 'support@gab.com'
     end
   end