[ARVADOS] updated: 1.3.0-3297-g6440951d1

[Git user]

Summary of changes:
 services/api/app/models/user.rb | 5 +++++
 1 file changed, 5 insertions(+)

       via  6440951d141dbb7ec953a90f0bd5d7f47035707d (commit)
      from  9df2ccdfc085a8b33aed9568c433b7f6e2c24353 (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 6440951d141dbb7ec953a90f0bd5d7f47035707d
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Fri Oct 9 18:52:14 2020 -0400

    Setup default VM from AutoSetupNewUsersWithVmUUID refs #16989
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/services/api/app/models/user.rb b/services/api/app/models/user.rb
index 57fe4f055..f8cc78c1d 100644
--- a/services/api/app/models/user.rb
+++ b/services/api/app/models/user.rb
@@ -221,6 +221,11 @@ SELECT target_uuid, perm_level
 
     group_perm = create_user_group_link
     repo_perm = create_user_repo_link repo_name
+
+    if vm_uuid.nil? and !Rails.configuration.Users.AutoSetupNewUsersWithVmUUID.empty?
+      vm_uuid = Rails.configuration.Users.AutoSetupNewUsersWithVmUUID
+    end
+
     vm_login_perm = create_vm_login_permission_link(vm_uuid, username) if vm_uuid
 
     if send_notification_email.nil?

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


hooks/post-receive
--