mirror of
https://github.com/lostisland/faraday.git
synced 2025-07-05 00:02:41 -04:00
Compare commits
No commits in common. "f33bd3782c4b110ffea1612dd4263224790cebbf" and "ca01f47f5d467bb7424b6e3c8840b7e66cf3aa28" have entirely different histories.
f33bd3782c
...
ca01f47f5d
@ -14,7 +14,7 @@ require 'forwardable'
|
|||||||
# conn.get '/'
|
# conn.get '/'
|
||||||
#
|
#
|
||||||
module Faraday
|
module Faraday
|
||||||
VERSION = "0.17.6"
|
VERSION = "0.17.5"
|
||||||
|
|
||||||
class << self
|
class << self
|
||||||
# Public: Gets or sets the root path that Faraday is being loaded from.
|
# Public: Gets or sets the root path that Faraday is being loaded from.
|
||||||
|
@ -1,15 +1,10 @@
|
|||||||
begin
|
begin
|
||||||
require 'multipart/post'
|
require 'composite_io'
|
||||||
|
require 'parts'
|
||||||
require 'stringio'
|
require 'stringio'
|
||||||
rescue LoadError
|
rescue LoadError
|
||||||
begin
|
$stderr.puts "Install the multipart-post gem."
|
||||||
require 'composite_io'
|
raise
|
||||||
require 'parts'
|
|
||||||
require 'stringio'
|
|
||||||
rescue LoadError
|
|
||||||
$stderr.puts "Install the multipart-post gem."
|
|
||||||
raise
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
module Faraday
|
module Faraday
|
||||||
@ -67,11 +62,6 @@ module Faraday
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
if defined?(::Multipart::Post::UploadIO)
|
UploadIO = ::UploadIO
|
||||||
UploadIO = ::Multipart::Post::UploadIO
|
Parts = ::Parts
|
||||||
Parts = ::Multipart::Post::Parts
|
|
||||||
else
|
|
||||||
UploadIO = ::UploadIO
|
|
||||||
Parts = ::Parts
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
Loading…
x
Reference in New Issue
Block a user