aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2006-03-05 17:17:27 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2006-03-05 17:17:27 +0000
commit84b8920a11985a771e6dbddbf5ed4e3852a2e790 (patch)
tree5e8eb9b38a5b276f76ac808e365185c0c914de7c /railties
parent2d491bddf7a716a3192d655ab8492dffca424815 (diff)
downloadrails-84b8920a11985a771e6dbddbf5ed4e3852a2e790.tar.gz
rails-84b8920a11985a771e6dbddbf5ed4e3852a2e790.tar.bz2
rails-84b8920a11985a771e6dbddbf5ed4e3852a2e790.zip
Dont generate migration when doing scaffolding
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3775 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties')
-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",