[ARVADOS] updated: 6b5d4089c243afdef346a0609467b6f7a00fd1e7

[Git user]

Summary of changes:
 .../controllers/arvados/v1/api_client_authorizations_controller.rb    | 4 ++++
 1 file changed, 4 insertions(+)

  discards  11fc08947a6630ef36fee3819eec1272a22997da (commit)
       via  6b5d4089c243afdef346a0609467b6f7a00fd1e7 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (11fc08947a6630ef36fee3819eec1272a22997da)
            \
             N -- N -- N (6b5d4089c243afdef346a0609467b6f7a00fd1e7)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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 6b5d4089c243afdef346a0609467b6f7a00fd1e7
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Mar 14 15:04:12 2016 -0400

    8079: Allow where(api_token: foo) and disallow where(api_token: ["contains", "f"])

diff --git a/services/api/app/controllers/arvados/v1/api_client_authorizations_controller.rb b/services/api/app/controllers/arvados/v1/api_client_authorizations_controller.rb
index 0040ee0..56d0d85 100644
--- a/services/api/app/controllers/arvados/v1/api_client_authorizations_controller.rb
+++ b/services/api/app/controllers/arvados/v1/api_client_authorizations_controller.rb
@@ -61,7 +61,13 @@ class Arvados::V1::ApiClientAuthorizationsController < ApplicationController
     end
     if @where
       wanted_scopes << @where['scopes']
-      @where.select! { |attr, val| attr == 'uuid' }
+      @where.select! { |attr, val|
+        # "where":{"uuid":"zzzzz-zzzzz-zzzzzzzzzzzzzzz"} is OK but
+        # "where":{"api_client_id":1} is not supported
+        # "where":{"uuid":["contains","-"]} is not supported
+        # "where":{"uuid":["uuid1","uuid2","uuid3"]} is not supported
+        val.is_a?(String) && (attr == 'uuid' || attr == 'api_token')
+      }
     end
     @objects = model_class.
       includes(:user, :api_client).

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


hooks/post-receive
--