aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--actionpack/CHANGELOG.md4
-rw-r--r--activesupport/CHANGELOG.md34
2 files changed, 19 insertions, 19 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 7dd42f7d31..770bda1d44 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,6 +1,6 @@
* Added `#reverse_merge` and `#reverse_merge!` methods to `ActionController::Parameters`
- *Edouard Chin & Mitsutaka Mimura*
+ *Edouard Chin*, *Mitsutaka Mimura*
* Fix malformed URLS when using `ApplicationController.renderer`
@@ -329,7 +329,7 @@
redirects to
POST https://example.com/articles (i.e. ArticlesContoller#create)
- *Chirag Singhal*
+ *Chirag Singhal*
* Add `:as` option to `ActionController:TestCase#process` and related methods.
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index 024202de9c..2cee8375b7 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -260,7 +260,7 @@
to avoid duplication of duration constants through the codebase and
eliminate creation of intermediate durations.
- *Andrey Novikov, Andrew White*
+ *Andrey Novikov*, *Andrew White*
* Change return value of `Rational#duplicable?`, `ComplexClass#duplicable?`
to false.
@@ -499,28 +499,28 @@
*John Gesimondo*
* `travel/travel_to` travel time helpers, now raise on nested calls,
- as this can lead to confusing time stubbing.
+ as this can lead to confusing time stubbing.
- Instead of:
+ Instead of:
- travel_to 2.days.from_now do
- # 2 days from today
- travel_to 3.days.from_now do
- # 5 days from today
- end
- end
+ travel_to 2.days.from_now do
+ # 2 days from today
+ travel_to 3.days.from_now do
+ # 5 days from today
+ end
+ end
- preferred way to achieve above is:
+ preferred way to achieve above is:
- travel 2.days do
- # 2 days from today
- end
+ travel 2.days do
+ # 2 days from today
+ end
- travel 5.days do
- # 5 days from today
- end
+ travel 5.days do
+ # 5 days from today
+ end
- *Vipul A M*
+ *Vipul A M*
* Support parsing JSON time in ISO8601 local time strings in
`ActiveSupport::JSON.decode` when `parse_json_times` is enabled.