diff options
author | José Valim <jose.valim@gmail.com> | 2011-11-17 07:10:11 -0800 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2011-11-17 07:10:11 -0800 |
commit | d8b2b6a183020aaaacb901dd78ec2b901b119a0d (patch) | |
tree | 7f036bd2b75168d0a0c9039470608d270f26268d /railties/guides/code/getting_started/config | |
parent | e2d3060a68fcd680ca37a625cfc097131947edb6 (diff) | |
parent | 0af93089deaf6dc9428c0f2f7a376cdb6f81daee (diff) | |
download | rails-d8b2b6a183020aaaacb901dd78ec2b901b119a0d.tar.gz rails-d8b2b6a183020aaaacb901dd78ec2b901b119a0d.tar.bz2 rails-d8b2b6a183020aaaacb901dd78ec2b901b119a0d.zip |
Merge pull request #3663 from atambo/master
Move schema_format :sql config setting from test.rb to application.rb
Diffstat (limited to 'railties/guides/code/getting_started/config')
-rw-r--r-- | railties/guides/code/getting_started/config/application.rb | 5 | ||||
-rw-r--r-- | railties/guides/code/getting_started/config/environments/test.rb | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/railties/guides/code/getting_started/config/application.rb b/railties/guides/code/getting_started/config/application.rb index e914b5a80e..e16da30f72 100644 --- a/railties/guides/code/getting_started/config/application.rb +++ b/railties/guides/code/getting_started/config/application.rb @@ -39,6 +39,11 @@ module Blog # Configure sensitive parameters which will be filtered from the log file. config.filter_parameters += [:password] + # Use SQL instead of Active Record's schema dumper when creating the database. + # This is necessary if your schema can't be completely dumped by the schema dumper, + # like if you have constraints or database-specific column types + # config.active_record.schema_format = :sql + # Enable the asset pipeline config.assets.enabled = true diff --git a/railties/guides/code/getting_started/config/environments/test.rb b/railties/guides/code/getting_started/config/environments/test.rb index 833241ace3..08697cbbc9 100644 --- a/railties/guides/code/getting_started/config/environments/test.rb +++ b/railties/guides/code/getting_started/config/environments/test.rb @@ -29,11 +29,6 @@ Blog::Application.configure do # ActionMailer::Base.deliveries array. config.action_mailer.delivery_method = :test - # Use SQL instead of Active Record's schema dumper when creating the test database. - # This is necessary if your schema can't be completely dumped by the schema dumper, - # like if you have constraints or database-specific column types - # config.active_record.schema_format = :sql - # Print deprecation notices to the stderr config.active_support.deprecation = :stderr |