aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators.rb
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2010-06-08 21:23:29 +0200
committerXavier Noria <fxn@hashref.com>2010-06-08 21:23:29 +0200
commit751f79a03351f1f0d21436b2b947352b97ded093 (patch)
tree9dd053597389241398c9173ab7f565697bef055f /railties/lib/rails/generators.rb
parente7e6ee3e7b075f5447697a6038cb46d65f9b137a (diff)
parentab2877cbe89e266ee986fc12e603abd93ac017ad (diff)
downloadrails-751f79a03351f1f0d21436b2b947352b97ded093.tar.gz
rails-751f79a03351f1f0d21436b2b947352b97ded093.tar.bz2
rails-751f79a03351f1f0d21436b2b947352b97ded093.zip
Merge remote branch 'rails/master'
Diffstat (limited to 'railties/lib/rails/generators.rb')
-rw-r--r--railties/lib/rails/generators.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb
index af92757053..f4990bfb4c 100644
--- a/railties/lib/rails/generators.rb
+++ b/railties/lib/rails/generators.rb
@@ -178,6 +178,7 @@ module Rails
"#{orm}:migration",
"#{orm}:model",
"#{orm}:observer",
+ "#{orm}:session_migration",
"#{test}:controller",
"#{test}:helper",
"#{test}:integration",
@@ -186,8 +187,11 @@ module Rails
"#{test}:observer",
"#{test}:scaffold",
"#{test}:view",
+ "#{test}:performance",
+ "#{test}:plugin",
"#{template}:controller",
- "#{template}:scaffold"
+ "#{template}:scaffold",
+ "#{template}:mailer"
]
end
end