diff options
Diffstat (limited to 'actionpack/lib/action_controller.rb')
-rwxr-xr-x | actionpack/lib/action_controller.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb index 51db64bf44..340f41163d 100755 --- a/actionpack/lib/action_controller.rb +++ b/actionpack/lib/action_controller.rb @@ -26,8 +26,12 @@ $:.unshift(File.dirname(__FILE__)) begin require 'active_support' rescue LoadError - require 'rubygems' - require_gem 'activesupport' + begin + require File.dirname(__FILE__) + '/../../activesupport/lib/active_support' + rescue LoadError + require 'rubygems' + require_gem 'activesupport' + end end require 'action_controller/base' |