[ARVADOS] updated: 2.1.0-513-g569982eaa

[Git user]

Summary of changes:
 doc/api/permission-model.html.textile.liquid                 | 2 +-
 lib/controller/localdb/conn.go                               | 2 +-
 services/api/app/controllers/arvados/v1/groups_controller.rb | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

       via  569982eaa34ca549fc25953bcd20570af8e53398 (commit)
      from  056ae0b55536032cadf18d57edcd1c98a9d0ac40 (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 569982eaa34ca549fc25953bcd20570af8e53398
Author: Ward Vandewege <ward at curii.com>
Date:   Tue Mar 30 12:35:12 2021 -0400

    17119: more changes after review feedback.
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/doc/api/permission-model.html.textile.liquid b/doc/api/permission-model.html.textile.liquid
index d9e16e047..82e8128c6 100644
--- a/doc/api/permission-model.html.textile.liquid
+++ b/doc/api/permission-model.html.textile.liquid
@@ -67,7 +67,7 @@ A "project" is a subtype of Group that is displayed as a "Project" in Workbench,
 * Projects can be targets (@head_uuid@) of permission links, but not origins (@tail_uuid@).  Putting a project in a @tail_uuid@ field is an error.
 
 A "filter" is a subtype of Group that is displayed as a "Project" in Workbench, and as a directory by @arv-mount at . See "the groups API documentation":/api/methods/groups.html for more information.
-* A filter group cannot own things (cannot appear in @owner_uuid@).  Putting a role in an @owner_uuid@ field is an error.
+* A filter group cannot own things (cannot appear in @owner_uuid@).  Putting a filter group in an @owner_uuid@ field is an error.
 * A filter group can be owned by a user or a project.
 * The name of a filter is unique only among projects and filters with the same owner_uuid.
 * Filters can be targets (@head_uuid@) of permission links, but not origins (@tail_uuid@).  Putting a filter in a @tail_uuid@ field is an error.
diff --git a/lib/controller/localdb/conn.go b/lib/controller/localdb/conn.go
index c6b70ed2e..28e0bf6e2 100644
--- a/lib/controller/localdb/conn.go
+++ b/lib/controller/localdb/conn.go
@@ -51,7 +51,7 @@ func (conn *Conn) UserAuthenticate(ctx context.Context, opts arvados.UserAuthent
 func (conn *Conn) GroupContents(ctx context.Context, options arvados.GroupContentsOptions) (arvados.ObjectList, error) {
 	// The requested UUID can be a user (virtual home project), which we just pass on to
 	// the API server.
-	if strings.Index(options.UUID, "j7d0g") != 6 {
+	if strings.Index(options.UUID, "-j7d0g-") != 5 {
 		return conn.railsProxy.GroupContents(ctx, options)
 	}
 
diff --git a/services/api/app/controllers/arvados/v1/groups_controller.rb b/services/api/app/controllers/arvados/v1/groups_controller.rb
index a8957de75..aef956fb3 100644
--- a/services/api/app/controllers/arvados/v1/groups_controller.rb
+++ b/services/api/app/controllers/arvados/v1/groups_controller.rb
@@ -310,7 +310,7 @@ class Arvados::V1::GroupsController < ApplicationController
         klass_items_available = klass_object_list[:items_available] || 0
       else
         # klass_object_list[:items_available] is not populated
-        klass_items_available = countless_items_available || 0
+        klass_items_available = countless_items_available
       end
       @items_available += klass_items_available
       @offset = [@offset - klass_items_available, 0].max

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


hooks/post-receive
--