diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-02-15 16:21:56 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-02-15 16:21:56 +0000 |
| commit | dcfd6aa3bd91c93adf6ed47453a084327f018000 (patch) | |
| tree | 18ced844d47153bb3118a9d92790883a7a361b35 /railties/lib/rails_generator.rb | |
| parent | b3767f7f0bcb138ec3c677a39ffe0cb145e1427f (diff) | |
| download | rails-dcfd6aa3bd91c93adf6ed47453a084327f018000.tar.gz rails-dcfd6aa3bd91c93adf6ed47453a084327f018000.tar.bz2 rails-dcfd6aa3bd91c93adf6ed47453a084327f018000.zip | |
Move Controllers wrapper module away from environment.rb and into dependencies.rb
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@627 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/lib/rails_generator.rb')
| -rw-r--r-- | railties/lib/rails_generator.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/railties/lib/rails_generator.rb b/railties/lib/rails_generator.rb index 3e7f459345..8268f3f5f0 100644 --- a/railties/lib/rails_generator.rb +++ b/railties/lib/rails_generator.rb @@ -23,7 +23,12 @@ $:.unshift(File.dirname(__FILE__)) -require 'active_support' +begin + require 'active_support' +rescue LoadError + require 'rubygems' + require_gem 'activesupport' +end require 'rails_generator/base' require 'rails_generator/lookup' |