diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2005-03-06 12:20:53 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-03-06 12:20:53 +0000 |
commit | 6d566e82b40d636c13ee1ae3b59737e0620196af (patch) | |
tree | eb25dfd11537ab1ef90808953d5ec9daf70cd139 /actionpack | |
parent | 25b656fefa75954cffff119a14cf7650f4f99a92 (diff) | |
download | rails-6d566e82b40d636c13ee1ae3b59737e0620196af.tar.gz rails-6d566e82b40d636c13ee1ae3b59737e0620196af.tar.bz2 rails-6d566e82b40d636c13ee1ae3b59737e0620196af.zip |
Fixed rails_generator to be usable without RubyGems #686 [Cristi BALAN]. Moved all active support dependencies into active support
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@838 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
-rwxr-xr-x | actionpack/lib/action_controller.rb | 11 | ||||
-rwxr-xr-x | actionpack/lib/action_controller/base.rb | 3 |
2 files changed, 4 insertions, 10 deletions
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb index d434310eff..c9e4f8b9ef 100755 --- a/actionpack/lib/action_controller.rb +++ b/actionpack/lib/action_controller.rb @@ -22,16 +22,13 @@ #++ $:.unshift(File.dirname(__FILE__)) +$:.unshift(File.dirname(__FILE__) + "/../../activesupport/lib") begin - require 'active_support' + require 'active_support' rescue LoadError - begin - require File.dirname(__FILE__) + '/../../activesupport/lib/active_support' - rescue LoadError - require 'rubygems' - require_gem 'activesupport' - end + require 'rubygems' + require_gem 'activesupport' end require 'action_controller/base' diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 7c4c226c34..e75df4c127 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -2,9 +2,6 @@ require 'action_controller/request' require 'action_controller/response' require 'action_controller/routing' require 'action_controller/url_rewriter' -require 'active_support/class_attribute_accessors' -require 'active_support/class_inheritable_attributes' -require 'active_support/inflector' require 'drb' module ActionController #:nodoc: |