[ARVADOS] updated: c22bd85568bdef0358a82bb20e4995477c7d24ac

[Git user]

Summary of changes:
 services/api/app/controllers/application_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

       via  c22bd85568bdef0358a82bb20e4995477c7d24ac (commit)
       via  96b33e5ac77dbd0a003b428d5531431f3e999bef (commit)
      from  9456885954b0bff02721bbb14da296be212efdc4 (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 c22bd85568bdef0358a82bb20e4995477c7d24ac
Merge: 9456885 96b33e5
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed May 10 10:23:20 2017 -0400

    Merge branch '11629-groups-contents-memory'
    
    refs #11629
    refs #11458


commit 96b33e5ac77dbd0a003b428d5531431f3e999bef
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed May 10 10:22:42 2017 -0400

    11629: Fix ambiguous column reference.

diff --git a/services/api/app/controllers/application_controller.rb b/services/api/app/controllers/application_controller.rb
index 6bac512..b6816d3 100644
--- a/services/api/app/controllers/application_controller.rb
+++ b/services/api/app/controllers/application_controller.rb
@@ -283,7 +283,7 @@ class ApplicationController < ActionController::Base
       limit_query = @objects.
         except(:select, :distinct).
         select("(%s) as read_length" %
-               limit_columns.map { |s| "octet_length(#{s})" }.join(" + "))
+               limit_columns.map { |s| "octet_length(#{model_class.table_name}.#{s})" }.join(" + "))
       new_limit = 0
       read_total = 0
       limit_query.each do |record|

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


hooks/post-receive
--