aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support
diff options
context:
space:
mode:
Diffstat (limited to 'activesupport/lib/active_support')
-rw-r--r--activesupport/lib/active_support/json/encoding.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/json/encoding.rb b/activesupport/lib/active_support/json/encoding.rb
index 3f266d1e96..dbce7e710a 100644
--- a/activesupport/lib/active_support/json/encoding.rb
+++ b/activesupport/lib/active_support/json/encoding.rb
@@ -9,7 +9,7 @@ require 'active_support/core_ext/array/wrap'
require 'active_support/core_ext/hash/except'
require 'active_support/core_ext/hash/slice'
require 'active_support/core_ext/object/instance_variables'
-require 'active_support/time'
+require 'time'
module ActiveSupport
class << self
@@ -212,7 +212,7 @@ class Time
if ActiveSupport.use_standard_json_time_format
xmlschema
else
- %(#{strftime("%Y/%m/%d %H:%M:%S")} #{formatted_offset(false)})
+ strftime("%Y/%m/%d %H:%M:%S %z")
end
end
end