[ARVADOS] updated: fe7c0afe1cc1838506e40c08a11e0bc799260dc9

[git at public.curoverse.com]

Summary of changes:
 services/api/config/initializers/time_format.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

       via  fe7c0afe1cc1838506e40c08a11e0bc799260dc9 (commit)
      from  afa3f1f4815f1895d3342de56713cc37435ec7bd (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 fe7c0afe1cc1838506e40c08a11e0bc799260dc9
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Mon Feb 16 19:27:09 2015 -0500

    4759: add (options = nil) to time_format -> as_json method. Several tests in websocket_test.rb failed with the following without this:
     SELECT "logs".* FROM "logs" WHERE (logs.id >= 7) ORDER BY id asc LIMIT 20
    Error publishing event: wrong number of arguments (1 for 0)
    Backtrace:
    	/home/radhika/arvados/services/api/config/initializers/time_format.rb:2:in `as_json'
    	/home/radhika/.rvm/gems/ruby-2.1.1/gems/activesupport-3.2.17/lib/active_support/json/encoding.rb:55:in `block in as_json'
    	/home/radhika/.rvm/gems/ruby-2.1.1/gems/activesupport-3.2.17/lib/active_support/json/encoding.rb:77:in `check_for_circular_references'
    	/home/radhika/.rvm/gems/ruby-2.1.1/gems/activesupport-3.2.17/lib/active_support/json/encoding.rb:54:in `as_json'

diff --git a/services/api/config/initializers/time_format.rb b/services/api/config/initializers/time_format.rb
index ca67b19..0c049f4 100644
--- a/services/api/config/initializers/time_format.rb
+++ b/services/api/config/initializers/time_format.rb
@@ -1,5 +1,5 @@
 class ActiveSupport::TimeWithZone
-  def as_json
+  def as_json(options = nil) 
     strftime "%Y-%m-%dT%H:%M:%S.%NZ"
   end
 end

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


hooks/post-receive
--