[ARVADOS] updated: 31407b1e131c90895037db4e6b72b8ba00fc874e

[git at public.curoverse.com]

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

       via  31407b1e131c90895037db4e6b72b8ba00fc874e (commit)
      from  234f7303d0c4424cdb91e8b24f870a8d0f5de556 (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 31407b1e131c90895037db4e6b72b8ba00fc874e
Author: Ward Vandewege <ward at curoverse.com>
Date:   Sun Nov 2 23:39:40 2014 -0500

    system_user and anonymous_user should be excluded from
    auto_setup_new_user, always.
    
    refs #4383

diff --git a/services/api/app/models/user.rb b/services/api/app/models/user.rb
index ecd50cc..e48693b 100644
--- a/services/api/app/models/user.rb
+++ b/services/api/app/models/user.rb
@@ -451,6 +451,8 @@ class User < ArvadosModel
   def auto_setup_new_user
     return true if !Rails.configuration.auto_setup_new_users
     return true if !self.email
+    return true if self.uuid == system_user_uuid
+    return true if self.uuid == anonymous_user_uuid
 
     if Rails.configuration.auto_setup_new_users_with_vm_uuid ||
        Rails.configuration.auto_setup_new_users_with_repository

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


hooks/post-receive
--