Skip to content

Commit

Permalink
Treat rails 4 the same as rails 3
Browse files Browse the repository at this point in the history
  • Loading branch information
tomhughes committed Jul 7, 2013
1 parent 0d44085 commit 5a375df
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/oauth-plugin.rb
Expand Up @@ -3,15 +3,15 @@
require 'oauth/request_proxy/rack_request'
require 'oauth/server'
require 'oauth/controllers/application_controller_methods'
if Rails.version =~ /^3\./
if Rails::VERSION::MAJOR >= 3
require 'oauth/request_proxy/rack_request'
else
require 'oauth/request_proxy/action_controller_request'
ActionController::Base.send :include, OAuth::Controllers::ApplicationControllerMethods
end


if Rails.version =~ /^3\./
if Rails::VERSION::MAJOR >= 3
module OAuth
module Plugin
class OAuthRailtie < Rails::Railtie
Expand Down

0 comments on commit 5a375df

Please sign in to comment.