aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorAbdelkader Boudih <terminale@gmail.com>2014-09-17 21:59:46 +0100
committerAbdelkader Boudih <terminale@gmail.com>2014-09-17 21:59:46 +0100
commit46d168e957577c4a39417b7cd3ba5e0bc4bacde7 (patch)
treece37a5755c0f88b18cc642b31b9f9fe1cb22b32f /activesupport
parent026289e28e9dcfe14a161e40766a17220ad9233d (diff)
parentf92ac245bd283e889eaefd32f2701d407cb00126 (diff)
downloadrails-46d168e957577c4a39417b7cd3ba5e0bc4bacde7.tar.gz
rails-46d168e957577c4a39417b7cd3ba5e0bc4bacde7.tar.bz2
rails-46d168e957577c4a39417b7cd3ba5e0bc4bacde7.zip
Merge pull request #16950 from akshay-vishnoi/docs-rails-4point2
Grammar correction in ActiveSupport CHANGELOG [ci skip]
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/CHANGELOG.md8
1 files changed, 4 insertions, 4 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index f80f4fada2..8f328335b2 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -125,8 +125,8 @@
* Always instrument `ActiveSupport::Cache`.
- Since `ActiveSupport::Notifications` only instrument items when there
- are subscriber we don't need to disable instrumentation.
+ Since `ActiveSupport::Notifications` only instruments items when there
+ are attached subscribers, we don't need to disable instrumentation.
*Peter Wagenet*
@@ -311,8 +311,8 @@
*Pavel Pravosud*
-* `HashWithIndifferentAccess` better respects `#to_hash` on objects it's
- given. In particular, `.new`, `#update`, `#merge`, `#replace` all accept
+* `HashWithIndifferentAccess` better respects `#to_hash` on objects it
+ recieves. In particular, `.new`, `#update`, `#merge`, `#replace` all accept
objects which respond to `#to_hash`, even if those objects are not Hashes
directly.