diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2012-01-18 08:06:48 -0500 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2012-01-18 08:06:48 -0500 |
| commit | ae7037eba06f248e19dec4bf9583a873d9b6ae22 (patch) | |
| tree | b5c6df9d71e5be0cdc6ae4c0d508b9d7ed2eb5a2 | |
| parent | 02e4d7ffd4b96d13efd0c5ebba703606fc2e6414 (diff) | |
| download | rails-ae7037eba06f248e19dec4bf9583a873d9b6ae22.tar.gz rails-ae7037eba06f248e19dec4bf9583a873d9b6ae22.tar.bz2 rails-ae7037eba06f248e19dec4bf9583a873d9b6ae22.zip | |
Update CHANGELOG and docs for config.assets.logger
| -rw-r--r-- | actionpack/CHANGELOG.md | 2 | ||||
| -rw-r--r-- | railties/guides/source/configuring.textile | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 81bf0c7dc4..c88baae616 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,5 +1,7 @@ ## Rails 3.2.0 (unreleased) ## +* Setting config.assets.logger to false turn off Sprockets logger *Guillermo Iguaran* + * Add `config.action_dispatch.default_charset` to configure default charset for ActionDispatch::Response. *Carlos Antonio da Silva* * Deprecate setting default charset at controller level, use the new `config.action_dispatch.default_charset` instead. *Carlos Antonio da Silva* diff --git a/railties/guides/source/configuring.textile b/railties/guides/source/configuring.textile index 9a6f40b9e6..2488f86450 100644 --- a/railties/guides/source/configuring.textile +++ b/railties/guides/source/configuring.textile @@ -156,8 +156,7 @@ Rails 3.1, by default, is set up to use the +sprockets+ gem to manage assets wit * +config.assets.compile+ is a boolean that can be used to turn on live Sprockets compilation in production. -* +config.assets.logger+ accepts a logger conforming to the interface of Log4r or the default Ruby +Logger+ class. Defaults to the same configured at +config.logger+. - +* +config.assets.logger+ accepts a logger conforming to the interface of Log4r or the default Ruby +Logger+ class. Defaults to the same configured at +config.logger+. Setting +config.assets.logger+ to false will turn off served assets logging. h4. Configuring Generators |