Skip to content

Commit 0810e2c

Browse files
committed
Merge pull request #53582 from eregon/patch-1
Check if Regexp.timeout = is supported in configuration.rb
1 parent 4ffd4cd commit 0810e2c

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

railties/lib/rails/application/configuration.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ def load_defaults(target_version)
345345
action_dispatch.strict_freshness = true
346346
end
347347

348-
Regexp.timeout ||= 1
348+
Regexp.timeout ||= 1 if Regexp.respond_to?(:timeout=)
349349
else
350350
raise "Unknown version #{target_version.to_s.inspect}"
351351
end

tools/rail_inspector/lib/rail_inspector/visitor/framework_default.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ def current_framework
120120

121121
def respond_to_framework?(node)
122122
if node in SyntaxTree::CallNode[
123+
receiver: nil,
123124
message: SyntaxTree::Ident[value: "respond_to?"],
124125
arguments: SyntaxTree::ArgParen[
125126
arguments: SyntaxTree::Args[

0 commit comments

Comments
 (0)