lib/faraday/connection.rb in faraday-2.0.0.alpha.pre.2 vs lib/faraday/connection.rb in faraday-2.0.0.alpha.pre.3
- old
+ new
@@ -62,10 +62,10 @@
# @yield [self] after all setup has been done
def initialize(url = nil, options = nil)
options = ConnectionOptions.from(options)
if url.is_a?(Hash) || url.is_a?(ConnectionOptions)
- options = options.merge(url)
+ options = Utils.deep_merge(options, url)
url = options.url
end
@parallel_manager = nil
@headers = Utils::Headers.new