[ARVADOS] updated: 94da3d49e1d5c0be59111bfcda77844d9a5c83b3

[git at public.curoverse.com]

Summary of changes:
 .../app/views/users/_setup_popup.html.erb          |    4 ++--
 .../workbench/app/views/users/_show_admin.html.erb |    3 ++-
 services/api/Gemfile                               |    2 +-
 services/api/Gemfile.lock                          |   10 ++++++++--
 4 files changed, 13 insertions(+), 6 deletions(-)

       via  94da3d49e1d5c0be59111bfcda77844d9a5c83b3 (commit)
       via  d863894888d560867d91d9fcfa057b02dd42dd69 (commit)
       via  ad0944aa970bf52bcc2387ac57e12cb69ae54d66 (commit)
      from  566649e5561e10dabfac6cd4387d5dc197644d6a (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 94da3d49e1d5c0be59111bfcda77844d9a5c83b3
Author: radhika chippada <radhika at radhika.curoverse>
Date:   Sun Mar 30 21:15:45 2014 -0400

    Working on setup popup

diff --git a/apps/workbench/app/views/users/_setup_popup.html.erb b/apps/workbench/app/views/users/_setup_popup.html.erb
index fb119c3..167d4a8 100644
--- a/apps/workbench/app/views/users/_setup_popup.html.erb
+++ b/apps/workbench/app/views/users/_setup_popup.html.erb
@@ -5,11 +5,11 @@
     <h3 id="myModalLabel">Modal header</h3>
   </div>
   <div class="modal-body">
-    **here comes whatever you want to show!**
+    Enter something: <input type="text" id="myInput">
   </div>
   <div class="modal-footer">
     <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
-    <button class="btn btn-primary">Save changes</button>
+    <button class="btn  btn-primary">Save changes</button>
   </div>
 </div>
 
diff --git a/apps/workbench/app/views/users/_show_admin.html.erb b/apps/workbench/app/views/users/_show_admin.html.erb
index b63f41c..077de78 100644
--- a/apps/workbench/app/views/users/_show_admin.html.erb
+++ b/apps/workbench/app/views/users/_show_admin.html.erb
@@ -17,7 +17,8 @@ account.</p>
 <blockquote>
 
 <div>
-<%= button_to "Setup #{@object.full_name}", setup_user_url(id: @object.uuid), {class: 'btn btn-primary',  'data-toggle' => 'modal', 'data-target' => '#modal-window'}  %>
+<a href="#" class="btn btn-primary" data-toggle="modal"
+   data-target="#modal-window">Setup <%= "#{@object.full_name}" %> </a>
  <%= render :partial => 'setup_popup' %>
 </div>
 

commit d863894888d560867d91d9fcfa057b02dd42dd69
Merge: 566649e ad0944a
Author: radhika chippada <radhika at radhika.curoverse>
Date:   Sun Mar 30 18:09:32 2014 -0400

    Merge branch 'master' into 2272-setup-user-in-workbench


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


hooks/post-receive
--