diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2012-03-04 16:13:54 -0800 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2012-03-04 16:13:54 -0800 |
| commit | db3d5f00c312d0c5ddfac60055eb4fd9260c130b (patch) | |
| tree | eca429afb9f067a72f22a4fa997d62894f36723d /railties/lib | |
| parent | 641a4f62405cc2765424320932902ed8076b5d38 (diff) | |
| parent | 5afb2f7b40d1712f2e9ec1a69062d6e9b175e639 (diff) | |
| download | rails-db3d5f00c312d0c5ddfac60055eb4fd9260c130b.tar.gz rails-db3d5f00c312d0c5ddfac60055eb4fd9260c130b.tar.bz2 rails-db3d5f00c312d0c5ddfac60055eb4fd9260c130b.zip | |
Merge pull request #5275 from rafaelfranca/master
Only add the whitelist_attributes option if ActiveRecord is present
Diffstat (limited to 'railties/lib')
| -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 03242a3bef..e47784994a 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/application.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb @@ -54,7 +54,7 @@ module <%= app_const_base %> # This will create an empty whitelist of attributes available for mass-assignment for all models # in your app. As such, your models will need to explicitly whitelist or blacklist accessible # parameters by using an attr_accessible or attr_protected declaration. - config.active_record.whitelist_attributes = true + <%= comment_if :skip_active_record %>config.active_record.whitelist_attributes = true # 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 |