[ARVADOS] updated: eb0012d203974e54023dfcac6e04fd4c2c40270f

[Git user]

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

       via  eb0012d203974e54023dfcac6e04fd4c2c40270f (commit)
      from  2b62223c9ba420208b9f293825e7f6ae3f50f95b (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 eb0012d203974e54023dfcac6e04fd4c2c40270f
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Jun 14 11:38:03 2017 -0400

    10557: Remove redundant hook condition.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curoverse.com>

diff --git a/services/api/app/models/user.rb b/services/api/app/models/user.rb
index c4a4f92..f807bea 100644
--- a/services/api/app/models/user.rb
+++ b/services/api/app/models/user.rb
@@ -20,9 +20,7 @@ class User < ArvadosModel
   before_update :verify_repositories_empty, :if => Proc.new { |user|
     user.username.nil? and user.username_changed?
   }
-  before_update :setup_on_activate, :if => Proc.new { |user|
-    ![system_user_uuid, anonymous_user_uuid].include?(user.uuid)
-  }
+  before_update :setup_on_activate
   before_create :check_auto_admin
   before_create :set_initial_username, :if => Proc.new { |user|
     user.username.nil? and user.email

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


hooks/post-receive
--