[ARVADOS] updated: fbb4e2d894e5c6043e778991002629fbfdd08956

[git at public.curoverse.com]

Summary of changes:
 .../workbench/app/views/users/_show_admin.html.erb |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

       via  fbb4e2d894e5c6043e778991002629fbfdd08956 (commit)
      from  e40fdedbc285a0fa6af16e41b5b4f72e46e9987d (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 fbb4e2d894e5c6043e778991002629fbfdd08956
Author: radhika chippada <radhika at radhika.curoverse>
Date:   Thu Mar 27 11:44:12 2014 -0400

    Update the text on the deactivate link

diff --git a/apps/workbench/app/views/users/_show_admin.html.erb b/apps/workbench/app/views/users/_show_admin.html.erb
index c43ce02..0cc5f74 100644
--- a/apps/workbench/app/views/users/_show_admin.html.erb
+++ b/apps/workbench/app/views/users/_show_admin.html.erb
@@ -6,10 +6,8 @@ account.</p>
 <%= button_to "Log in as #{@object.full_name}", sudo_user_url(id: @object.uuid), class: 'btn btn-primary' %>
 </blockquote>
 
-<p>As an admin, you can deactivate this user.</p>
+<p>As an admin, you can deactivate and reset this user. This will remove all repository/VM permissions for the user. If you "setup" the user again, the user will have to sign the user agreement again.</p>
 
 <blockquote>
 <%=  link_to "Deactivate #{@object.full_name}", { action: 'unsetup', id: @object.uuid }, { confirm: "Are you sure you want to deactivate #{@object.full_name}?", method: 'post' } %>
 </blockquote>
-
-

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


hooks/post-receive
--