Merge bf89a45 into 554930c

lostisland · Jan 6, 2022 · d50355d · d50355d
2 parents 554930c + bf89a45
commit d50355d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/faraday.rb b/lib/faraday.rb
@@ -26,9 +26,11 @@
 require 'faraday/error'
 require 'faraday/request/url_encoded' # needed by multipart
 
-# External Middleware gems
+# External Middleware gems and their aliases
 require 'faraday/multipart'
 require 'faraday/retry'
+Faraday::Request::Multipart = Faraday::Multipart::Middleware
+Faraday::Request::Retry = Faraday::Retry::Middleware
 
 # External Adapters gems
 unless defined?(JRUBY_VERSION)

diff --git a/lib/faraday/request.rb b/lib/faraday/request.rb
@@ -35,8 +35,6 @@ class Request < Struct.new(
 
     register_middleware File.expand_path('request', __dir__),
                         url_encoded: [:UrlEncoded, 'url_encoded'],
-                        multipart: [:Multipart, 'multipart'],
-                        retry: [:Retry, 'retry'],
                         authorization: [:Authorization, 'authorization'],
                         basic_auth: [
                           :BasicAuthentication,