diff options
| author | Xavier Noria <fxn@hashref.com> | 2014-02-06 15:03:20 +0100 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2014-02-06 15:03:20 +0100 |
| commit | c0fb8d0b9c4d55770f7ce1a9cb62e4f2a75ca3ee (patch) | |
| tree | 66bfa9ed07cc0ef7e82552eebac49a5b5d8838b5 /railties/lib | |
| parent | 7f648bc70e76b7a386a41f882ddd97105334f590 (diff) | |
| parent | 8806768e9f1a2648085f7826d9a0032457182bdb (diff) | |
| download | rails-c0fb8d0b9c4d55770f7ce1a9cb62e4f2a75ca3ee.tar.gz rails-c0fb8d0b9c4d55770f7ce1a9cb62e4f2a75ca3ee.tar.bz2 rails-c0fb8d0b9c4d55770f7ce1a9cb62e4f2a75ca3ee.zip | |
Merge branch 'dump-schema-after-migration-flag' of git://github.com/emilsoman/rails into emilsoman-dump-schema-after-migration-flag
Conflicts:
activerecord/CHANGELOG.md
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt index d2f041aa27..d9cc60d656 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt +++ b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt @@ -81,4 +81,9 @@ Rails.application.configure do # Use default logging formatter so that PID and timestamp are not suppressed. config.log_formatter = ::Logger::Formatter.new + <%- unless options.skip_active_record? -%> + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false + <%- end -%> end |