aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/duration.rb
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2010-12-29 22:20:14 +0000
committerPratik Naik <pratiknaik@gmail.com>2010-12-29 22:20:14 +0000
commit0ac66caac5581c4793d120c8ad4a2cf4137f6ce2 (patch)
tree6de0b3cdd589c648a525c2c3d6e1878c9bf4df78 /activesupport/lib/active_support/duration.rb
parent43433b3fb4b9c054e0bcaaa1f7456b3fececd268 (diff)
downloadrails-0ac66caac5581c4793d120c8ad4a2cf4137f6ce2.tar.gz
rails-0ac66caac5581c4793d120c8ad4a2cf4137f6ce2.tar.bz2
rails-0ac66caac5581c4793d120c8ad4a2cf4137f6ce2.zip
Fix Duration#to_json
Diffstat (limited to 'activesupport/lib/active_support/duration.rb')
-rw-r--r--activesupport/lib/active_support/duration.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/duration.rb b/activesupport/lib/active_support/duration.rb
index de3ded1e1f..00c67a470d 100644
--- a/activesupport/lib/active_support/duration.rb
+++ b/activesupport/lib/active_support/duration.rb
@@ -80,6 +80,10 @@ module ActiveSupport
parts.to_sentence(:locale => :en)
end
+ def as_json(options = nil) #:nodoc:
+ to_i
+ end
+
protected
def sum(sign, time = ::Time.current) #:nodoc: