diff options
| author | Prathamesh Sonpatki <csonpatki@gmail.com> | 2013-03-24 02:14:21 +0530 |
|---|---|---|
| committer | Prathamesh Sonpatki <csonpatki@gmail.com> | 2013-03-24 02:14:21 +0530 |
| commit | 33d1e374082a482237f52569b489403abdb2770a (patch) | |
| tree | 7da5e77671e0c9113c1979caeacf4169ceef8604 /activemodel | |
| parent | 49760c1ef9afb6290af21357126a88c51c835fa5 (diff) | |
| download | rails-33d1e374082a482237f52569b489403abdb2770a.tar.gz rails-33d1e374082a482237f52569b489403abdb2770a.tar.bz2 rails-33d1e374082a482237f52569b489403abdb2770a.zip | |
Reverted change in activemodel/CHANGELOG.md introduced by d45145acdc576e46a1f1719d69bec96b5bf07b0a
Diffstat (limited to 'activemodel')
| -rw-r--r-- | activemodel/CHANGELOG.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md index 6539cc4442..c6d7b0b5d3 100644 --- a/activemodel/CHANGELOG.md +++ b/activemodel/CHANGELOG.md @@ -70,7 +70,7 @@ *Yves Senn* -* Use BCrypt's `MIN_COST` in the test environment for speedier tests when using `has_secure_password`. +* Use BCrypt's `MIN_COST` in the test environment for speedier tests when using `has_secure_pasword`. *Brian Cardarella + Jeremy Kemper + Trevor Turk* @@ -111,7 +111,7 @@ * Changed `ActiveModel::Serializers::Xml::Serializer#add_associations` to by default propagate `:skip_types, :dasherize, :camelize` keys to included associations. - It can be overridden on each association by explicitly specifying the option on one + It can be overriden on each association by explicitly specifying the option on one or more associations *Anthony Alberto* |