aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb b/railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb
index e589a9e233..d8e9538299 100644
--- a/railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb
+++ b/railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb
@@ -73,7 +73,7 @@ class ScaffoldGenerator < Rails::Generator::NamedBase
m.directory File.join('test/functional', controller_class_path)
# Depend on model generator but skip if the model exists.
- m.dependency 'model', [singular_name], :collision => :skip
+ m.dependency 'model', [singular_name], :collision => :skip, :skip_migration => true
# Scaffolded forms.
m.complex_template "form.rhtml",