diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-07-12 21:39:36 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-07-12 21:39:36 +0100 |
| commit | 0cfa3574d599f3bc134cd13fa00d8f22809dd67b (patch) | |
| tree | b8af1a893ba900c9901c9b1fb7a9a2246aba67c6 /activesupport/CHANGELOG | |
| parent | ef67bd481bacd1ff36a79b7f23f3c08f12f6cbe1 (diff) | |
| parent | 99cc85bc099a757cdd44e4f5f1be4972ab124e0d (diff) | |
| download | rails-0cfa3574d599f3bc134cd13fa00d8f22809dd67b.tar.gz rails-0cfa3574d599f3bc134cd13fa00d8f22809dd67b.tar.bz2 rails-0cfa3574d599f3bc134cd13fa00d8f22809dd67b.zip | |
Merge commit 'mainstream/master'
Conflicts:
actionpack/lib/action_controller/base.rb
railties/lib/rails_generator/commands.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 73c965b1db..983e7d0dac 100644 --- a/activesupport/CHANGELOG +++ b/activesupport/CHANGELOG @@ -1,5 +1,7 @@ *Edge* +* Move the test related core_ext stuff out of core_ext so it's only loaded by the test helpers. [Michael Koziarski] + * Add Inflection rules for String#humanize. #535 [dcmanges] ActiveSupport::Inflector.inflections do |inflect| |