diff options
author | David Yip <yipdw@member.fsf.org> | 2017-12-06 15:40:59 -0600 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2017-12-06 15:40:59 -0600 |
commit | f1cbea77a4a52929244198dcbde26d63d837489a (patch) | |
tree | 82645dbc9eec65f870ce7a211355deb6bdc29f29 /app/mailers | |
parent | 21e28a5caa5e92165322c4127c89a6f88e68198a (diff) | |
parent | 8ca91cef45417947607079118b1af07c9774ae58 (diff) |
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
Diffstat (limited to 'app/mailers')
-rw-r--r-- | app/mailers/notification_mailer.rb | 2 | ||||
-rw-r--r-- | app/mailers/user_mailer.rb | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/mailers/notification_mailer.rb b/app/mailers/notification_mailer.rb index d79f26366..fd2b0649a 100644 --- a/app/mailers/notification_mailer.rb +++ b/app/mailers/notification_mailer.rb @@ -63,7 +63,7 @@ class NotificationMailer < ApplicationMailer end end - def digest(recipient, opts = {}) + def digest(recipient, **opts) @me = recipient @since = opts[:since] || @me.user.last_emailed_at || @me.user.current_sign_in_at @notifications = Notification.where(account: @me, activity_type: 'Mention').where('created_at > ?', @since) diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb index bdb29ebad..5a062dc25 100644 --- a/app/mailers/user_mailer.rb +++ b/app/mailers/user_mailer.rb @@ -5,7 +5,7 @@ class UserMailer < Devise::Mailer helper :instance - def confirmation_instructions(user, token, _opts = {}) + def confirmation_instructions(user, token, **) @resource = user @token = token @instance = Rails.configuration.x.local_domain @@ -17,7 +17,7 @@ class UserMailer < Devise::Mailer end end - def reset_password_instructions(user, token, _opts = {}) + def reset_password_instructions(user, token, **) @resource = user @token = token @instance = Rails.configuration.x.local_domain @@ -29,7 +29,7 @@ class UserMailer < Devise::Mailer end end - def password_change(user, _opts = {}) + def password_change(user, **) @resource = user @instance = Rails.configuration.x.local_domain |