aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/core_ext/date_and_time/compatibility.rb
diff options
context:
space:
mode:
authorVipul A M <vipulnsward@gmail.com>2016-04-23 20:16:30 +0530
committerVipul A M <vipulnsward@gmail.com>2016-04-24 01:18:15 +0530
commitabeabdbc881f3c992e50f053c94c36749a2e8226 (patch)
tree3692b6d08cd0b390e26371832e940226cd428b1a /activesupport/lib/active_support/core_ext/date_and_time/compatibility.rb
parentee5e476aad791e41c97f2a833f41bb5899d5252b (diff)
downloadrails-abeabdbc881f3c992e50f053c94c36749a2e8226.tar.gz
rails-abeabdbc881f3c992e50f053c94c36749a2e8226.tar.bz2
rails-abeabdbc881f3c992e50f053c94c36749a2e8226.zip
Follow up of https://github.com/rails/rails/commit/c9c5788a527b70d7f983e2b4b47e3afd863d9f48
[ci skip]
Diffstat (limited to 'activesupport/lib/active_support/core_ext/date_and_time/compatibility.rb')
-rw-r--r--activesupport/lib/active_support/core_ext/date_and_time/compatibility.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/activesupport/lib/active_support/core_ext/date_and_time/compatibility.rb b/activesupport/lib/active_support/core_ext/date_and_time/compatibility.rb
index b8eb587390..59aa3ccac2 100644
--- a/activesupport/lib/active_support/core_ext/date_and_time/compatibility.rb
+++ b/activesupport/lib/active_support/core_ext/date_and_time/compatibility.rb
@@ -1,12 +1,12 @@
module DateAndTime
module Compatibility
- # If true, +to_time+ preserves the the timezone offset.
+ # If true, +to_time+ preserves the timezone offset of receiver.
#
# NOTE: With Ruby 2.4+ the default for +to_time+ changed from
- # converting to the local system time to preserving the offset
+ # converting to the local system time, to preserving the offset
# of the receiver. For backwards compatibility we're overriding
- # this behavior but new apps will have an initializer that sets
- # this to true because the new behavior is preferred.
+ # this behavior, but new apps will have an initializer that sets
+ # this to true, because the new behavior is preferred.
mattr_accessor(:preserve_timezone, instance_writer: false) { false }
def to_time