diff options
| author | Michael Koziarski <michael@koziarski.com> | 2012-03-04 18:04:47 -0800 |
|---|---|---|
| committer | Michael Koziarski <michael@koziarski.com> | 2012-03-04 18:04:47 -0800 |
| commit | ebc5a19ba2b9befecdcd01393e990b678588ee66 (patch) | |
| tree | f05e26161cbde163ec91f20cec18de8181b7da2b /railties/lib/rails/generators | |
| parent | 06a3a8a458e70c1b6531ac53c57a302b162fd736 (diff) | |
| parent | 2a6b7e5a0cf0b3a74edf83340cb983d064ba79ee (diff) | |
| download | rails-ebc5a19ba2b9befecdcd01393e990b678588ee66.tar.gz rails-ebc5a19ba2b9befecdcd01393e990b678588ee66.tar.bz2 rails-ebc5a19ba2b9befecdcd01393e990b678588ee66.zip | |
Merge pull request #5278 from rafaelfranca/fix-build-3-2
[3-2-stable] Fix build
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 41e2d5dcc5..21e7a4b283 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/application.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb @@ -58,7 +58,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 <% unless options.skip_sprockets? -%> # Enable the asset pipeline |