diff options
| author | Piotr Sarnacki <drogus@gmail.com> | 2010-12-10 22:16:34 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-12-11 11:41:16 +0100 |
| commit | 307443972c5f6de959a5401eec76ca327484b10c (patch) | |
| tree | 2bf228641f7568a01a5dc4d486355495535d277e /railties/lib/rails | |
| parent | 7891de893951c780a1732747d430c33e998dd573 (diff) | |
| download | rails-307443972c5f6de959a5401eec76ca327484b10c.tar.gz rails-307443972c5f6de959a5401eec76ca327484b10c.tar.bz2 rails-307443972c5f6de959a5401eec76ca327484b10c.zip | |
Skip creating migration if --skip option is passed to model generator [#6144 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/generators/migration.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/migration.rb b/railties/lib/rails/generators/migration.rb index 8d98909055..0c5c4f6e09 100644 --- a/railties/lib/rails/generators/migration.rb +++ b/railties/lib/rails/generators/migration.rb @@ -52,7 +52,7 @@ module Rails destination = self.class.migration_exists?(migration_dir, @migration_file_name) - if behavior == :invoke + if !(destination && options[:skip]) && behavior == :invoke if destination && options.force? remove_file(destination) elsif destination |