diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2012-09-19 20:57:29 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-09-19 20:57:29 -0700 |
| commit | 71b88518f7c84466f90b3d39fba61281bb782748 (patch) | |
| tree | c9441d1b0dcee884405417717a8a3e3f171b3dae /railties | |
| parent | b4018fa74024ca4c80070f9922833431c567f0e7 (diff) | |
| parent | 25d2b17a99a78955a90682fa41fda268c5532129 (diff) | |
| download | rails-71b88518f7c84466f90b3d39fba61281bb782748.tar.gz rails-71b88518f7c84466f90b3d39fba61281bb782748.tar.bz2 rails-71b88518f7c84466f90b3d39fba61281bb782748.zip | |
Merge pull request #7702 from guilleiguaran/remove-manifest-option
Remove highly uncommon `config.assets.manifest` option
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG.md | 5 | ||||
| -rw-r--r-- | railties/lib/rails/application/configuration.rb | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index acd2077c2d..8c2b64d543 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -1,5 +1,10 @@ ## Rails 4.0.0 (unreleased) ## +* Remove highly uncommon `config.assets.manifest` option for moving the manifest path. + This option is now unsupported in sprockets-rails. + + *Guillermo Iguaran & Dmitry Vorotilin* + * Add `config.action_controller.permit_all_parameters` to disable StrongParameters protection, it's false by default. diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index 580d7c6c77..613c5b25f0 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -57,7 +57,6 @@ module Rails @assets.debug = false @assets.compile = true @assets.digest = false - @assets.manifest = nil @assets.cache_store = [ :file_store, "#{root}/tmp/cache/assets/" ] @assets.js_compressor = nil @assets.css_compressor = nil |