aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorPiotr Sarnacki <drogus@gmail.com>2010-11-21 02:47:20 +0100
committerJosé Valim <jose.valim@gmail.com>2010-11-22 13:43:18 +0100
commit115abd52b6bf6801dce7c3fbcb0e29d4213a5bb2 (patch)
treedb24268f3e8a4702843f2e9671d5b97d773eb0af /railties
parentf821055dc7bead5ab348f63279cd4321d4d9c3c8 (diff)
downloadrails-115abd52b6bf6801dce7c3fbcb0e29d4213a5bb2.tar.gz
rails-115abd52b6bf6801dce7c3fbcb0e29d4213a5bb2.tar.bz2
rails-115abd52b6bf6801dce7c3fbcb0e29d4213a5bb2.zip
Ensure that app generator is not loaded twice to get rid of warnings
Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb
index 27a4007c20..66c4088a68 100644
--- a/railties/lib/rails/generators.rb
+++ b/railties/lib/rails/generators.rb
@@ -302,6 +302,7 @@ module Rails
$LOAD_PATH.each do |base|
Dir[File.join(base, "{rails/generators,generators}", "**", "*_generator.rb")].each do |path|
begin
+ path = path.sub("#{base}/", "")
require path
rescue Exception => e
# No problem