[ARVADOS] updated: 96b6172daeeb0c4ca6ee9f3f72bccbcedc3b95d2

[git at public.curoverse.com]

Summary of changes:
 .../app/controllers/arvados/v1/users_controller.rb |    2 +-
 services/api/app/models/user.rb                    |    2 --
 2 files changed, 1 insertions(+), 3 deletions(-)

       via  96b6172daeeb0c4ca6ee9f3f72bccbcedc3b95d2 (commit)
      from  5390a8a8578538ad3b2bf0e7e541485c342acbea (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 96b6172daeeb0c4ca6ee9f3f72bccbcedc3b95d2
Author: radhika chippada <radhika at radhika.curoverse>
Date:   Thu Mar 27 15:04:46 2014 -0400

    minor cleanup

diff --git a/services/api/app/controllers/arvados/v1/users_controller.rb b/services/api/app/controllers/arvados/v1/users_controller.rb
index b28db7c..2adeb15 100644
--- a/services/api/app/controllers/arvados/v1/users_controller.rb
+++ b/services/api/app/controllers/arvados/v1/users_controller.rb
@@ -136,7 +136,7 @@ class Arvados::V1::UsersController < ApplicationController
   # delete user agreements, vm, repository, login links; set state to inactive
   def unsetup
     @object = User.find_by_uuid params[:uuid]
-    @object = @object.unsetup
+    @object.unsetup
     show
   end
 
diff --git a/services/api/app/models/user.rb b/services/api/app/models/user.rb
index b86ac6c..c09b67c 100644
--- a/services/api/app/models/user.rb
+++ b/services/api/app/models/user.rb
@@ -185,8 +185,6 @@ class User < ArvadosModel
     # mark the user as inactive
     self.is_active = false
     self.save!
-
-    return self
   end 
 
   protected

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


hooks/post-receive
--