diff options
| author | José Valim <jose.valim@plataformatec.com.br> | 2012-01-31 07:58:33 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@plataformatec.com.br> | 2012-01-31 07:58:33 -0800 |
| commit | 40b218977ecf171852f6b00587b77602edf180de (patch) | |
| tree | 88dc32742bb7f01501bb389f4afede574d6bb80a /railties/lib/rails/generators | |
| parent | bc194cf564243899a4d2f97f2d2f3f50d72ff379 (diff) | |
| parent | 25a69e2ea51e419af8fc72dffdea94edb7e24e55 (diff) | |
| download | rails-40b218977ecf171852f6b00587b77602edf180de.tar.gz rails-40b218977ecf171852f6b00587b77602edf180de.tar.bz2 rails-40b218977ecf171852f6b00587b77602edf180de.zip | |
Merge pull request #4792 from rafaelfranca/build-fix
Only add ActiveRecord configuration if it is present
Diffstat (limited to 'railties/lib/rails/generators')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/application.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/application.rb b/railties/lib/rails/generators/rails/app/templates/config/application.rb index c3a87d30b4..acf47a03e5 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/application.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb @@ -59,7 +59,7 @@ module <%= app_const_base %> # Specifies wether or not has_many or has_one association option :dependent => :restrict raises # an exception. If set to true, then an ActiveRecord::DeleteRestrictionError exception would be # raised. If set to false, then an error will be added on the model instead. - config.active_record.dependent_restrict_raises = false + <%= comment_if :skip_active_record %>config.active_record.dependent_restrict_raises = false <% unless options.skip_sprockets? -%> # Enable the asset pipeline. |