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 /railties | |
| 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 'railties')
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/rails_generator.rb | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 6d6a447f74..0d2ef851af 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fixed rails_generator to be usable without RubyGems #686 [Cristi BALAN] + * Fixed -h/--help for generate and destroy generators #331 * Added begin/rescue around the FCGI dispatcher so no uncaught exceptions can bubble up to kill the process (logs to log/fastcgi.crash.log) diff --git a/railties/lib/rails_generator.rb b/railties/lib/rails_generator.rb index 8268f3f5f0..9c587c9552 100644 --- a/railties/lib/rails_generator.rb +++ b/railties/lib/rails_generator.rb @@ -22,9 +22,10 @@ #++ $:.unshift(File.dirname(__FILE__)) +$:.unshift(File.dirname(__FILE__) + "/../../activesupport/lib") begin - require 'active_support' + require 'active_support' rescue LoadError require 'rubygems' require_gem 'activesupport' |