Merge pull request #42349 from jhawthorn/bump_rack_dependency
Bump rack to remove ssl? override
This commit is contained in:
commit
cb8fc821ae
@ -45,7 +45,7 @@ PATH
|
||||
actionpack (7.0.0.alpha)
|
||||
actionview (= 7.0.0.alpha)
|
||||
activesupport (= 7.0.0.alpha)
|
||||
rack (~> 2.0, >= 2.0.9)
|
||||
rack (~> 2.0, >= 2.2.0)
|
||||
rack-test (>= 0.6.3)
|
||||
rails-dom-testing (~> 2.0)
|
||||
rails-html-sanitizer (~> 1.0, >= 1.2.0)
|
||||
|
@ -34,7 +34,7 @@
|
||||
|
||||
s.add_dependency "activesupport", version
|
||||
|
||||
s.add_dependency "rack", "~> 2.0", ">= 2.0.9"
|
||||
s.add_dependency "rack", "~> 2.0", ">= 2.2.0"
|
||||
s.add_dependency "rack-test", ">= 0.6.3"
|
||||
s.add_dependency "rails-html-sanitizer", "~> 1.0", ">= 1.2.0"
|
||||
s.add_dependency "rails-dom-testing", "~> 2.0"
|
||||
|
@ -428,10 +428,6 @@ def logger
|
||||
def commit_flash
|
||||
end
|
||||
|
||||
def ssl?
|
||||
super || scheme == "wss"
|
||||
end
|
||||
|
||||
def inspect # :nodoc:
|
||||
"#<#{self.class.name} #{method} #{original_url.dump} for #{remote_ip}>"
|
||||
end
|
||||
|
Loading…
Reference in New Issue
Block a user