aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2017-02-26 08:20:18 +0100
committerGitHub <noreply@github.com>2017-02-26 08:20:18 +0100
commit31d27d5301c79c351c69b91d64e32a64b0f2b0fb (patch)
tree3b401569b62419fb65af6dd7415c2bb74fc427d7
parent83f7f4f0aff116433b5be5fb21a3a1e8a24d8299 (diff)
parente842db501f5240fd547e904f173ad8d7b1304f8c (diff)
downloadrails-31d27d5301c79c351c69b91d64e32a64b0f2b0fb.tar.gz
rails-31d27d5301c79c351c69b91d64e32a64b0f2b0fb.tar.bz2
rails-31d27d5301c79c351c69b91d64e32a64b0f2b0fb.zip
Merge pull request #28173 from vipulnsward/as-ch-pass
AS CHANGELOG Pass
-rw-r--r--activesupport/CHANGELOG.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index 6dc301e5b4..2f08d8bc82 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -5,7 +5,7 @@
* In Core Extensions, make `MarshalWithAutoloading#load` pass through the second, optional
argument for `Marshal#load( source [, proc] )`. This way we don't have to do
- `Marshal.method(:load).super_method.call(sourse, proc)` just to be able to pass a proc.
+ `Marshal.method(:load).super_method.call(source, proc)` just to be able to pass a proc.
*Jeff Latz*
@@ -20,7 +20,7 @@
*Adam Rice*
-* Deprecate `.halt_callback_chains_on_return_false`.
+* Deprecate `ActiveSupport.halt_callback_chains_on_return_false`.
*Rafael Mendonça França*
@@ -83,7 +83,7 @@
duration's numeric value isn't used in calculations, only parts are used.
Methods on `Numeric` like `2.days` now use these predefined durations
- to avoid duplicating of duration constants through the codebase and
+ to avoid duplication of duration constants through the codebase and
eliminate creation of intermediate durations.
*Andrey Novikov, Andrew White*