From 7ac574d9a9bb20684921150419cb3e559e9aad99 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Thu, 17 Nov 2016 12:29:11 +0100 Subject: Fix #148 - Devise mailer fixed, test spec added so it won't slip past again --- app/mailers/user_mailer.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'app/mailers') diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb index 5c086768d..e3ca39b3a 100644 --- a/app/mailers/user_mailer.rb +++ b/app/mailers/user_mailer.rb @@ -4,7 +4,7 @@ class UserMailer < Devise::Mailer default from: ENV.fetch('SMTP_FROM_ADDRESS') { 'notifications@localhost' } layout 'mailer' - def confirmation_instructions(user, token) + def confirmation_instructions(user, token, _opts = {}) @resource = user @token = token @@ -13,7 +13,7 @@ class UserMailer < Devise::Mailer end end - def reset_password_instructions(user, token) + def reset_password_instructions(user, token, _opts = {}) @resource = user @token = token @@ -22,7 +22,7 @@ class UserMailer < Devise::Mailer end end - def password_change(user) + def password_change(user, _opts = {}) @resource = user I18n.with_locale(@resource.locale || I18n.default_locale) do -- cgit