Fix keyword arguments warnings
This commit is contained in:
parent
af45834139
commit
352560308b
@ -918,7 +918,7 @@ def set_content_type(m, user_content_type, class_default) # :doc:
|
||||
# If the subject has interpolations, you can pass them through the +interpolations+ parameter.
|
||||
def default_i18n_subject(interpolations = {}) # :doc:
|
||||
mailer_scope = self.class.mailer_name.tr("/", ".")
|
||||
I18n.t(:subject, interpolations.merge(scope: [mailer_scope, action_name], default: action_name.humanize))
|
||||
I18n.t(:subject, **interpolations.merge(scope: [mailer_scope, action_name], default: action_name.humanize))
|
||||
end
|
||||
|
||||
# Emails do not support relative path links.
|
||||
|
@ -9,7 +9,7 @@ class SSLTest < ActionDispatch::IntegrationTest
|
||||
|
||||
def build_app(headers: {}, ssl_options: {})
|
||||
headers = HEADERS.merge(headers)
|
||||
ActionDispatch::SSL.new lambda { |env| [200, headers, []] }, ssl_options.reverse_merge(hsts: { subdomains: true })
|
||||
ActionDispatch::SSL.new lambda { |env| [200, headers, []] }, **ssl_options.reverse_merge(hsts: { subdomains: true })
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -27,7 +27,7 @@ def create_table
|
||||
version_options = connection.internal_string_options_for_primary_key
|
||||
|
||||
connection.create_table(table_name, id: false) do |t|
|
||||
t.string :version, version_options
|
||||
t.string :version, **version_options
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -38,7 +38,7 @@ def keeps_if_modified_since
|
||||
end
|
||||
private
|
||||
def render_conditionally(headers)
|
||||
if stale?(headers.merge(public: !params[:private]))
|
||||
if stale?(**headers.merge(public: !params[:private]))
|
||||
render plain: SecureRandom.hex(16)
|
||||
end
|
||||
end
|
||||
|
Loading…
Reference in New Issue
Block a user