mirror of
https://github.com/mastodon/mastodon.git
synced 2026-04-25 07:56:08 -05:00
Merge 2c81e6d0b2 into 28284b8452
This commit is contained in:
commit
da9787480d
|
|
@ -18,7 +18,7 @@ class UserMailer < Devise::Mailer
|
|||
|
||||
default to: -> { @resource.email }
|
||||
|
||||
def confirmation_instructions(user, token, *, **)
|
||||
def confirmation_instructions(user, token, **)
|
||||
@resource = user
|
||||
@token = token
|
||||
|
||||
|
|
@ -31,7 +31,7 @@ class UserMailer < Devise::Mailer
|
|||
end
|
||||
end
|
||||
|
||||
def reset_password_instructions(user, token, *, **)
|
||||
def reset_password_instructions(user, token, **)
|
||||
@resource = user
|
||||
@token = token
|
||||
|
||||
|
|
@ -42,7 +42,7 @@ class UserMailer < Devise::Mailer
|
|||
end
|
||||
end
|
||||
|
||||
def password_change(user, *, **)
|
||||
def password_change(user, **)
|
||||
@resource = user
|
||||
|
||||
return unless @resource.active_for_authentication?
|
||||
|
|
@ -52,7 +52,7 @@ class UserMailer < Devise::Mailer
|
|||
end
|
||||
end
|
||||
|
||||
def email_changed(user, *, **)
|
||||
def email_changed(user, **)
|
||||
@resource = user
|
||||
|
||||
return unless @resource.active_for_authentication?
|
||||
|
|
@ -62,7 +62,7 @@ class UserMailer < Devise::Mailer
|
|||
end
|
||||
end
|
||||
|
||||
def two_factor_enabled(user, *, **)
|
||||
def two_factor_enabled(user)
|
||||
@resource = user
|
||||
|
||||
return unless @resource.active_for_authentication?
|
||||
|
|
@ -72,7 +72,7 @@ class UserMailer < Devise::Mailer
|
|||
end
|
||||
end
|
||||
|
||||
def two_factor_disabled(user, *, **)
|
||||
def two_factor_disabled(user)
|
||||
@resource = user
|
||||
|
||||
return unless @resource.active_for_authentication?
|
||||
|
|
@ -82,7 +82,7 @@ class UserMailer < Devise::Mailer
|
|||
end
|
||||
end
|
||||
|
||||
def two_factor_recovery_codes_changed(user, *, **)
|
||||
def two_factor_recovery_codes_changed(user)
|
||||
@resource = user
|
||||
|
||||
return unless @resource.active_for_authentication?
|
||||
|
|
@ -92,7 +92,7 @@ class UserMailer < Devise::Mailer
|
|||
end
|
||||
end
|
||||
|
||||
def webauthn_enabled(user, *, **)
|
||||
def webauthn_enabled(user)
|
||||
@resource = user
|
||||
|
||||
return unless @resource.active_for_authentication?
|
||||
|
|
@ -102,7 +102,7 @@ class UserMailer < Devise::Mailer
|
|||
end
|
||||
end
|
||||
|
||||
def webauthn_disabled(user, *, **)
|
||||
def webauthn_disabled(user)
|
||||
@resource = user
|
||||
|
||||
return unless @resource.active_for_authentication?
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user