Merge pull request oauth-xx#126 from oauth-xx/silence_circular_depend…

…ency_warning Silencing 'loading in progress, circular require considered harmful'
tbtb01 · May 27, 2016 · 601f251 · 601f251
2 parents c91ebd4 + f4fc266
commit 601f251
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 3 deletions.
diff --git a/lib/oauth/client/action_controller_request.rb b/lib/oauth/client/action_controller_request.rb
@@ -1,4 +1,3 @@
-require 'oauth/client/helper'
 if defined? ActionDispatch
   require 'oauth/request_proxy/rack_request'
   require 'action_dispatch/testing/test_process'

diff --git a/lib/oauth/client/em_http.rb b/lib/oauth/client/em_http.rb
@@ -1,6 +1,5 @@
 require 'em-http'
 require 'oauth/helper'
-require 'oauth/client/helper'
 require 'oauth/request_proxy/em_http_request'
 
 # Extensions for em-http so that we can use consumer.sign! with an EventMachine::HttpClient

diff --git a/lib/oauth/client/net_http.rb b/lib/oauth/client/net_http.rb
@@ -1,5 +1,4 @@
 require 'oauth/helper'
-require 'oauth/client/helper'
 require 'oauth/request_proxy/net_http'
 
 class Net::HTTPGenericRequest