diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-03-13 10:55:52 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-03-13 10:55:52 -0700 |
| commit | e88da370f190cabd1e9750c5b3531735950ab415 (patch) | |
| tree | d2cb492f3fc5f10ff3ca050adac463f48e34fb35 /activesupport/lib | |
| parent | 15720df1808b249bae91e5600d6f0676990a7de0 (diff) | |
| download | rails-e88da370f190cabd1e9750c5b3531735950ab415.tar.gz rails-e88da370f190cabd1e9750c5b3531735950ab415.tar.bz2 rails-e88da370f190cabd1e9750c5b3531735950ab415.zip | |
make tests pass on Ruby 2.2
Apparently we've been using a buggy feature for the past 6 years:
https://bugs.ruby-lang.org/issues/9593
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/values/time_zone.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/values/time_zone.rb b/activesupport/lib/active_support/values/time_zone.rb index eb785d46ce..38f0d268f4 100644 --- a/activesupport/lib/active_support/values/time_zone.rb +++ b/activesupport/lib/active_support/values/time_zone.rb @@ -282,7 +282,7 @@ module ActiveSupport # # Time.zone.now # => Fri, 31 Dec 1999 14:00:00 HST -10:00 # Time.zone.parse('22:30:00') # => Fri, 31 Dec 1999 22:30:00 HST -10:00 - def parse(str, now=now) + def parse(str, now=now()) parts = Date._parse(str, false) return if parts.empty? |