aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorTobias Lütke <tobias.luetke@gmail.com>2005-10-16 21:47:42 +0000
committerTobias Lütke <tobias.luetke@gmail.com>2005-10-16 21:47:42 +0000
commitcbbb0368668cf7176bfecdf2559ae9e5b713bac7 (patch)
tree3ad4df3b1a00070510d89a9ddf8ad390af5f918c /railties
parent13fccff28321850375905bffcb4e2b25fcb50921 (diff)
downloadrails-cbbb0368668cf7176bfecdf2559ae9e5b713bac7.tar.gz
rails-cbbb0368668cf7176bfecdf2559ae9e5b713bac7.tar.bz2
rails-cbbb0368668cf7176bfecdf2559ae9e5b713bac7.zip
moved generators to lib/generators
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2658 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties')
-rw-r--r--railties/CHANGELOG2
-rw-r--r--railties/lib/rails_generator/lookup.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index abfb16cf03..9293fc4e71 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Moved generator folder from RAILS_ROOT/generators to RAILS_ROOT/lib/generators [Tobias Luetke]
+
* Fix rake dev and related commands [Nicholas Seckar]
* The rails command tries to deduce your MySQL socket by running `mysql_config
diff --git a/railties/lib/rails_generator/lookup.rb b/railties/lib/rails_generator/lookup.rb
index 47cf870bd6..6b40f94638 100644
--- a/railties/lib/rails_generator/lookup.rb
+++ b/railties/lib/rails_generator/lookup.rb
@@ -98,7 +98,7 @@ module Rails
# 4. Builtins. Model, controller, mailer, scaffold.
def use_component_sources!
reset_sources
- sources << PathSource.new(:app, "#{::RAILS_ROOT}/generators") if defined? ::RAILS_ROOT
+ sources << PathSource.new(:app, "#{::RAILS_ROOT}/lib/generators") if defined? ::RAILS_ROOT
sources << PathSource.new(:user, "#{Dir.user_home}/.rails/generators")
sources << GemSource.new if Object.const_defined?(:Gem)
sources << PathSource.new(:builtin, "#{File.dirname(__FILE__)}/generators/components")