[ARVADOS] updated: 1.2.0-376-g128b6c914

[Git user]

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

       via  128b6c914e9ac66744e36b4428c5235f3bde7089 (commit)
      from  1b7e38873458e9b94830658f384bd39daf6f95cd (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 128b6c914e9ac66744e36b4428c5235f3bde7089
Author: Ward Vandewege <wvandewege at veritasgenetics.com>
Date:   Tue Nov 20 13:45:14 2018 -0500

    14516: when calculating the next available username, make sure to take merged
    accounts into consideration - they have usernames too, and we have a unique
    index on username in the users table.
    
    refs #14516
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <wvandewege at veritasgenetics.com>

diff --git a/services/api/app/models/user.rb b/services/api/app/models/user.rb
index cc3a22cbf..e62150541 100644
--- a/services/api/app/models/user.rb
+++ b/services/api/app/models/user.rb
@@ -392,7 +392,7 @@ class User < ArvadosModel
     end
     0.upto(6).each do |suffix_len|
       pattern = "%s%s" % [quoted_name, "_" * suffix_len]
-      self.class.
+      self.class.unscoped.
           where("username like '#{pattern}'").
           select(:username).
           order('username asc').

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


hooks/post-receive
--