diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-10-05 19:46:48 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-10-05 19:46:48 +0100 |
| commit | 6090513cfb8acb5554a6653a6f2cb87648585d41 (patch) | |
| tree | 99bfd589a48153e33f19ae72baa6e98f5708a9b8 /activesupport/CHANGELOG | |
| parent | 01159a6431bbc2dc7d7d95ce294c8567c954f39e (diff) | |
| parent | 4df45d86097efbeabceecfe53d8ea2da9ccbb107 (diff) | |
| download | rails-6090513cfb8acb5554a6653a6f2cb87648585d41.tar.gz rails-6090513cfb8acb5554a6653a6f2cb87648585d41.tar.bz2 rails-6090513cfb8acb5554a6653a6f2cb87648585d41.zip | |
Merge commit 'mainstream/master'
Conflicts:
activerecord/lib/active_record/association_preload.rb
Diffstat (limited to 'activesupport/CHANGELOG')
| -rw-r--r-- | activesupport/CHANGELOG | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG index 9700a11531..2c6f4ed582 100644 --- a/activesupport/CHANGELOG +++ b/activesupport/CHANGELOG @@ -1,5 +1,7 @@ *Edge* +* Add ActiveSupport::Rescuable module abstracting ActionController::Base rescue_from features. [Norbert Crombach, Pratik] + * Switch from String#chars to String#mb_chars for the unicode proxy. [Manfred Stienstra] This helps with 1.8.7 compatibility and also improves performance for some operations by reducing indirection. |