aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel
diff options
context:
space:
mode:
authorPrathamesh Sonpatki <csonpatki@gmail.com>2013-03-24 00:34:06 +0530
committerPrathamesh Sonpatki <csonpatki@gmail.com>2013-03-24 00:34:06 +0530
commitd45145acdc576e46a1f1719d69bec96b5bf07b0a (patch)
tree46e85a31b6e5b47c0f37614b5dd03bd705ffa747 /activemodel
parent12cecdd345ae36816c2eb7f94e3855a7fcfed2f8 (diff)
downloadrails-d45145acdc576e46a1f1719d69bec96b5bf07b0a.tar.gz
rails-d45145acdc576e46a1f1719d69bec96b5bf07b0a.tar.bz2
rails-d45145acdc576e46a1f1719d69bec96b5bf07b0a.zip
Changed 'args' to 'arguments' when used in places other than code with fixing few more typos
Diffstat (limited to 'activemodel')
-rw-r--r--activemodel/CHANGELOG.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md
index c6d7b0b5d3..6539cc4442 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_pasword`.
+* Use BCrypt's `MIN_COST` in the test environment for speedier tests when using `has_secure_password`.
*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 overriden on each association by explicitly specifying the option on one
+ It can be overridden on each association by explicitly specifying the option on one
or more associations
*Anthony Alberto*