From 94774e48f67692c53b7ff2d4aabdc04e68b64742 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Fran=C3=A7a?= Date: Fri, 17 Jun 2016 15:43:51 -0400 Subject: [PATCH] Merge pull request #216 from PavelPenkov/better_rails_check Better check for Rails application --- lib/active_resource.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/active_resource.rb b/lib/active_resource.rb index ef3490e009..5432dfcc1b 100644 --- a/lib/active_resource.rb +++ b/lib/active_resource.rb @@ -42,5 +42,4 @@ module ActiveResource autoload :Collection end -require 'active_resource/railtie' if defined? Rails - +require 'active_resource/railtie' if defined?(Rails.application)