diff options
author | Pablo Ifran <pabloifran@gmail.com> | 2012-10-22 09:42:42 -0200 |
---|---|---|
committer | Pablo Ifran <pabloifran@gmail.com> | 2012-10-22 09:42:42 -0200 |
commit | e041a50f2917f82950f9e5666f966d8992afd45d (patch) | |
tree | 9f4d2e3aa88f28dba9d7a1d24d46977e0642a1eb /actionpack/CHANGELOG.md | |
parent | 3e6b2f5d38e0f31db3fb0fcd3bbab92666a0e3e2 (diff) | |
parent | ae27acb342c575ce19d5ad78cb13ba23f826fab1 (diff) | |
download | rails-e041a50f2917f82950f9e5666f966d8992afd45d.tar.gz rails-e041a50f2917f82950f9e5666f966d8992afd45d.tar.bz2 rails-e041a50f2917f82950f9e5666f966d8992afd45d.zip |
Merge branch 'master' of https://github.com/lifo/docrails
Conflicts:
activerecord/lib/active_record/callbacks.rb
Diffstat (limited to 'actionpack/CHANGELOG.md')
-rw-r--r-- | actionpack/CHANGELOG.md | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index fd02492834..48ba1518e0 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,6 +1,31 @@ ## Rails 4.0.0 (unreleased) ## -* Remove old asset tag concatenation (no longer needed now that we have the asset pipeline). *Josh Peek* +* `date_select` helper accepts `with_css_classes: true` to add css classes similar with type + of generated select tags. + + *Pavel Nikitin* + +* Only non-js/css under app/assets path will be included in default config.assets.precompile. + + *Josh Peek* + +* Remove support for the RAILS_ASSET_ID environment configuration + (no longer needed now that we have the asset pipeline). + + *Josh Peek* + +* Remove old asset_path configuration (no longer needed now that we have the asset pipeline). + + *Josh Peek* + +* `assert_template` can be used to assert on the same template with different locals + Fix #3675 + + *Yves Senn* + +* Remove old asset tag concatenation (no longer needed now that we have the asset pipeline). + + *Josh Peek* * Accept :remote as symbolic option for `link_to` helper. *Riley Lynch* |