aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2018-09-10 23:48:35 +0200
committerXavier Noria <fxn@hashref.com>2018-09-10 23:51:26 +0200
commite7fc2afb21bb09db00a61783755eda4509db99f7 (patch)
treed919bd25cec9c6f4ce55ba2732303fe74e968164 /activesupport
parent66ab9c74dd6232e85952e7324fcb130b33576d38 (diff)
downloadrails-e7fc2afb21bb09db00a61783755eda4509db99f7.tar.gz
rails-e7fc2afb21bb09db00a61783755eda4509db99f7.tar.bz2
rails-e7fc2afb21bb09db00a61783755eda4509db99f7.zip
Oxford comma [ci skip]
Followup to a recently merged PR, too minor and detailed to require a modification to the contributed patch.
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/testing/time_helpers.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/testing/time_helpers.rb b/activesupport/lib/active_support/testing/time_helpers.rb
index decb3179c4..f160e66971 100644
--- a/activesupport/lib/active_support/testing/time_helpers.rb
+++ b/activesupport/lib/active_support/testing/time_helpers.rb
@@ -158,7 +158,7 @@ module ActiveSupport
end
# Returns the current time back to its original state, by removing the stubs added by
- # +travel+, +travel_to+ and +freeze_time+.
+ # +travel+, +travel_to+, and +freeze_time+.
#
# Time.current # => Sat, 09 Nov 2013 15:34:49 EST -05:00
# travel_to Time.zone.local(2004, 11, 24, 01, 04, 44)