aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails_generator/generators
diff options
context:
space:
mode:
Diffstat (limited to 'railties/lib/rails_generator/generators')
-rw-r--r--railties/lib/rails_generator/generators/applications/app/app_generator.rb3
-rw-r--r--railties/lib/rails_generator/generators/components/model/model_generator.rb2
2 files changed, 4 insertions, 1 deletions
diff --git a/railties/lib/rails_generator/generators/applications/app/app_generator.rb b/railties/lib/rails_generator/generators/applications/app/app_generator.rb
index a192c14e0d..b421c5df74 100644
--- a/railties/lib/rails_generator/generators/applications/app/app_generator.rb
+++ b/railties/lib/rails_generator/generators/applications/app/app_generator.rb
@@ -129,6 +129,9 @@ class AppGenerator < Rails::Generator::Base
test/unit
vendor
vendor/plugins
+ tmp/sessions
+ tmp/sockets
+ tmp/cache
)
MYSQL_SOCKET_LOCATIONS = [
diff --git a/railties/lib/rails_generator/generators/components/model/model_generator.rb b/railties/lib/rails_generator/generators/components/model/model_generator.rb
index 5e9aa882f3..9cadf863fb 100644
--- a/railties/lib/rails_generator/generators/components/model/model_generator.rb
+++ b/railties/lib/rails_generator/generators/components/model/model_generator.rb
@@ -19,7 +19,7 @@ class ModelGenerator < Rails::Generator::NamedBase
unless options[:skip_migration]
m.migration_template 'migration.rb', 'db/migrate', :assigns => {
:migration_name => "Add#{class_name.pluralize}"
- }
+ }, :migration_file_name => "add_#{file_name.pluralize}"
end
end
end