diff options
| author | José Valim <jose.valim@gmail.com> | 2010-03-23 13:40:19 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-03-23 13:40:41 +0100 |
| commit | b61f6f59805eec4f5bb873a85910c9fe00e839a9 (patch) | |
| tree | 485dc3cee827ab4d79756e90d639ccc4dad464e1 /railties/lib/rails/generators.rb | |
| parent | b144b56d8288246f0de7437d10361a0f1ed2bd83 (diff) | |
| download | rails-b61f6f59805eec4f5bb873a85910c9fe00e839a9.tar.gz rails-b61f6f59805eec4f5bb873a85910c9fe00e839a9.tar.bz2 rails-b61f6f59805eec4f5bb873a85910c9fe00e839a9.zip | |
Load generators from both lib/rails/generators and lib/generators. Using the former since it's less obstrusive.
Diffstat (limited to 'railties/lib/rails/generators.rb')
| -rw-r--r-- | railties/lib/rails/generators.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb index 9a51171cf5..57462707f4 100644 --- a/railties/lib/rails/generators.rb +++ b/railties/lib/rails/generators.rb @@ -242,7 +242,7 @@ module Rails paths = namespaces_to_paths(namespaces) paths.each do |raw_path| - ["rails_generators", "generators"].each do |base| + ["rails/generators", "generators"].each do |base| path = "#{base}/#{raw_path}_generator" begin @@ -265,7 +265,7 @@ module Rails load_generators_from_railties! $LOAD_PATH.each do |base| - Dir[File.join(base, "{generators,rails_generators}", "**", "*_generator.rb")].each do |path| + Dir[File.join(base, "{rails/generators,generators}", "**", "*_generator.rb")].each do |path| begin require path rescue Exception => e |