Skip to content

Commit 3525603

Browse files
committed
Fix keyword arguments warnings
1 parent af45834 commit 3525603

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

actionmailer/lib/action_mailer/base.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -918,7 +918,7 @@ def set_content_type(m, user_content_type, class_default) # :doc:
918918
# If the subject has interpolations, you can pass them through the +interpolations+ parameter.
919919
def default_i18n_subject(interpolations = {}) # :doc:
920920
mailer_scope = self.class.mailer_name.tr("/", ".")
921-
I18n.t(:subject, interpolations.merge(scope: [mailer_scope, action_name], default: action_name.humanize))
921+
I18n.t(:subject, **interpolations.merge(scope: [mailer_scope, action_name], default: action_name.humanize))
922922
end
923923

924924
# Emails do not support relative path links.

actionpack/test/dispatch/ssl_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ class SSLTest < ActionDispatch::IntegrationTest
99

1010
def build_app(headers: {}, ssl_options: {})
1111
headers = HEADERS.merge(headers)
12-
ActionDispatch::SSL.new lambda { |env| [200, headers, []] }, ssl_options.reverse_merge(hsts: { subdomains: true })
12+
ActionDispatch::SSL.new lambda { |env| [200, headers, []] }, **ssl_options.reverse_merge(hsts: { subdomains: true })
1313
end
1414
end
1515

activerecord/lib/active_record/schema_migration.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def create_table
2727
version_options = connection.internal_string_options_for_primary_key
2828

2929
connection.create_table(table_name, id: false) do |t|
30-
t.string :version, version_options
30+
t.string :version, **version_options
3131
end
3232
end
3333
end

railties/test/application/middleware/cache_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def keeps_if_modified_since
3838
end
3939
private
4040
def render_conditionally(headers)
41-
if stale?(headers.merge(public: !params[:private]))
41+
if stale?(**headers.merge(public: !params[:private]))
4242
render plain: SecureRandom.hex(16)
4343
end
4444
end

0 commit comments

Comments
 (0)