[ARVADOS] updated: 1.1.4-598-g321e025cd

[Git user]

Summary of changes:
 services/api/config/initializers/oj_mimic_json.rb | 11 +++++++++++
 services/api/config/initializers/time_format.rb   |  2 ++
 2 files changed, 13 insertions(+)
 create mode 100644 services/api/config/initializers/oj_mimic_json.rb

       via  321e025cde18b8069dfc8977754af39f2efe505a (commit)
      from  051b9e763b0a14f9039f536859bd2c1580faa31c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 321e025cde18b8069dfc8977754af39f2efe505a
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date:   Mon Jul 16 17:52:52 2018 -0300

    13803: Re-enable Oj's rails optimizations & fix time format test failures.
    
    There's one failing test pending on collection controller: when asking for
    the index with select="" the followin exception is being masked by
    load_limit_offset_order_params():
    
    JSON::ParserError: Empty input at line 1, column 1 [parse.c:928]
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>

diff --git a/services/api/config/initializers/oj_mimic_json.rb b/services/api/config/initializers/oj_mimic_json.rb
new file mode 100644
index 000000000..ce2d40c45
--- /dev/null
+++ b/services/api/config/initializers/oj_mimic_json.rb
@@ -0,0 +1,11 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
+require 'oj'
+
+Oj::Rails.set_encoder()
+Oj::Rails.set_decoder()
+Oj::Rails.optimize()
+Oj::Rails.mimic_JSON()
+
diff --git a/services/api/config/initializers/time_format.rb b/services/api/config/initializers/time_format.rb
index 3d690930a..78cabc87a 100644
--- a/services/api/config/initializers/time_format.rb
+++ b/services/api/config/initializers/time_format.rb
@@ -2,6 +2,8 @@
 #
 # SPDX-License-Identifier: AGPL-3.0
 
+ActiveSupport::JSON::Encoding.time_precision = 9
+
 class ActiveSupport::TimeWithZone
   remove_method :as_json
   def as_json *args

-----------------------------------------------------------------------


hooks/post-receive
--