aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorAman Gupta <aman@tmm1.net>2014-12-22 20:14:14 -0800
committerAman Gupta <aman@tmm1.net>2014-12-22 20:14:14 -0800
commit8fd52705eda6a2cd7e9a8a5bc723fa094e359eb7 (patch)
tree74ecb50d25d2624800ce55cbf321f6bef878dee0 /activesupport
parentba886f73a2b4a06f3400f0698290c54566639b6a (diff)
downloadrails-8fd52705eda6a2cd7e9a8a5bc723fa094e359eb7.tar.gz
rails-8fd52705eda6a2cd7e9a8a5bc723fa094e359eb7.tar.bz2
rails-8fd52705eda6a2cd7e9a8a5bc723fa094e359eb7.zip
fix ruby 2.2 warning: circular argument reference
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/values/time_zone.rb2
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 f935180036..618c93125c 100644
--- a/activesupport/lib/active_support/values/time_zone.rb
+++ b/activesupport/lib/active_support/values/time_zone.rb
@@ -267,7 +267,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?