[ARVADOS] updated: 6a210c4771acb18751e48f7e7c0841eb68469d90

[git at public.curoverse.com]

Summary of changes:
 services/api/Gemfile                               |    4 ++--
 .../api/app/controllers/application_controller.rb  |    5 +++--
 services/api/test/integration/valid_links_test.rb  |    3 ---
 3 files changed, 5 insertions(+), 7 deletions(-)

       via  6a210c4771acb18751e48f7e7c0841eb68469d90 (commit)
      from  f580cf6d3d86f6591e68b4501279fc45cbf847e0 (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 6a210c4771acb18751e48f7e7c0841eb68469d90
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Fri Apr 11 15:45:08 2014 -0400

    Reverted accidental change to Gemfile.
    Restored parameter check in load_filters_param.
    Removed spurious commented-out code from test.

diff --git a/services/api/Gemfile b/services/api/Gemfile
index 25b2c24..e8e09b2 100644
--- a/services/api/Gemfile
+++ b/services/api/Gemfile
@@ -15,7 +15,7 @@ end
 gem 'pg'
 
 # Start using multi_json once we are on Rails 3.2;
-# Rails 3.1 has a dependency on multi_json < 1.3.0 but we need version 1.3.4 to 
+# Rails 3.1 has a dependency on multi_json < 1.3.0 but we need version 1.3.4 to
 # fix bug https://github.com/collectiveidea/json_spec/issues/27
 gem 'multi_json'
 gem 'oj'
@@ -63,4 +63,4 @@ gem 'test_after_commit', :group => :test
 gem 'google-api-client', '~> 0.6.3'
 gem 'trollop'
 
-#gem 'arvados-cli', '>= 0.1.20140328152103'
+gem 'arvados-cli', '>= 0.1.20140328152103'
diff --git a/services/api/app/controllers/application_controller.rb b/services/api/app/controllers/application_controller.rb
index 0039bb0..76b59be 100644
--- a/services/api/app/controllers/application_controller.rb
+++ b/services/api/app/controllers/application_controller.rb
@@ -123,8 +123,9 @@ class ApplicationController < ActionController::Base
       @filters += params[:filters]
     elsif params[:filters].is_a? String and !params[:filters].empty?
       begin
-        @filters += Oj.load params[:filters]
-        raise unless @filters.is_a? Array
+        f = Oj.load params[:filters]
+        raise unless f.is_a? Array
+        @filters += f
       rescue
         raise ArgumentError.new("Could not parse \"filters\" param as an array")
       end
diff --git a/services/api/test/integration/valid_links_test.rb b/services/api/test/integration/valid_links_test.rb
index 65431f3..657bf02 100644
--- a/services/api/test/integration/valid_links_test.rb
+++ b/services/api/test/integration/valid_links_test.rb
@@ -25,9 +25,6 @@ class ValidLinksTest < ActionDispatch::IntegrationTest
       }
     }, admin_auth
     assert_response :success
-    #puts @response.body
-    #puts jresponse['tail_uuid']
-    #puts virtual_machines(:testvm2)
     assert_equal virtual_machines(:testvm2).uuid, (ActiveSupport::JSON.decode @response.body)['tail_uuid']
 
     put "/arvados/v1/links/#{u}", {

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


hooks/post-receive
--