diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb index 20458435e..00bdab9dc 100644 --- a/app/mailers/user_mailer.rb +++ b/app/mailers/user_mailer.rb @@ -8,14 +8,6 @@ class UserMailer < ActionMailer::Base mail(:to => "#{dmail.to.name} <#{dmail.to.email}>", :subject => "#{Danbooru.config.app_name} - Message received from #{dmail.from.name}") end - def upgrade(user, email) - mail(:to => "#{user.name} <#{email}>", :subject => "#{Danbooru.config.app_name} account upgrade") - end - - def upgrade_fail(email) - mail(:to => "#{user.name} <#{email}>", :subject => "#{Danbooru.config.app_name} account upgrade") - end - def forum_notice(user, forum_topic, forum_posts) @user = user @forum_topic = forum_topic diff --git a/app/models/report_mailer.rb b/app/models/report_mailer.rb deleted file mode 100644 index 9c2313916..000000000 --- a/app/models/report_mailer.rb +++ /dev/null @@ -1,7 +0,0 @@ -class ReportMailer < ActionMailer::Base - default :host => Danbooru.config.server_host, :from => Danbooru.config.contact_email, :content_type => "text/html" - - def moderator_report(email) - mail(:to => email, :subject => "#{Danbooru.config.app_name} - Moderator Report") - end -end diff --git a/app/views/user_mailer/upgrade.html.erb b/app/views/user_mailer/upgrade.html.erb deleted file mode 100644 index d2d7ff18a..000000000 --- a/app/views/user_mailer/upgrade.html.erb +++ /dev/null @@ -1,6 +0,0 @@ - - -
-You can upgrade your account by sending $20 USD via Paypal to <%= mail_to Danbooru.config.upgrade_account_email %>. Be sure to include your username.
- - diff --git a/app/views/user_mailer/upgrade_fail.html.erb b/app/views/user_mailer/upgrade_fail.html.erb deleted file mode 100644 index ae0a32671..000000000 --- a/app/views/user_mailer/upgrade_fail.html.erb +++ /dev/null @@ -1,6 +0,0 @@ - - - -Account upgrades are currently disabled.
- -