about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-11-17 12:29:11 +0100
committerEugen Rochko <eugen@zeonfederated.com>2016-11-17 12:29:11 +0100
commit7ac574d9a9bb20684921150419cb3e559e9aad99 (patch)
tree0088c930d451530a2c6646476e61ff2175c8bd72 /app
parentb2e504616aea3c274395575bfcca8cf45de1d180 (diff)
Fix #148 - Devise mailer fixed, test spec added so it won't slip past again
Diffstat (limited to 'app')
-rw-r--r--app/mailers/user_mailer.rb6
1 files changed, 3 insertions, 3 deletions
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