[ARVADOS] updated: bfa116482e0eadfbd6aadd990f40d5d2634a844d

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/views/collections/_sharing_button.html.erb | 2 +-
 apps/workbench/app/views/users/_add_ssh_key_popup.html.erb    | 2 +-
 apps/workbench/app/views/users/_setup_popup.html.erb          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

       via  bfa116482e0eadfbd6aadd990f40d5d2634a844d (commit)
       via  b235746745d5da25588b50183cad91d1b6b50529 (commit)
      from  74c10d0016ccf0337c66000308e67ca6a907f86f (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 bfa116482e0eadfbd6aadd990f40d5d2634a844d
Author: Brett Smith <brett at curoverse.com>
Date:   Wed Dec 3 10:28:42 2014 -0500

    4291: Workbench says explicitly when collection sharing is disabled.

diff --git a/apps/workbench/app/views/collections/_sharing_button.html.erb b/apps/workbench/app/views/collections/_sharing_button.html.erb
index 9d3639c..57f3e9c 100644
--- a/apps/workbench/app/views/collections/_sharing_button.html.erb
+++ b/apps/workbench/app/views/collections/_sharing_button.html.erb
@@ -4,7 +4,7 @@
      method: :post,
    } %>
 <% if @search_sharing.nil? %>
-  <%# API token can't manage other tokens.  Disable this feature. %>
+  <p>Your API token is not authorized to manage collection sharing links.</p>
 <% elsif @search_sharing.empty? %>
   <%= button_to("Create sharing link", {action: "share"}, button_attrs) %>
 <% else %>

commit b235746745d5da25588b50183cad91d1b6b50529
Author: Brett Smith <brett at curoverse.com>
Date:   Wed Dec 3 10:25:43 2014 -0500

    4291: Revert bad method string→symbol changes.

diff --git a/apps/workbench/app/views/users/_add_ssh_key_popup.html.erb b/apps/workbench/app/views/users/_add_ssh_key_popup.html.erb
index 8cd5ae3..3bfaf69 100644
--- a/apps/workbench/app/views/users/_add_ssh_key_popup.html.erb
+++ b/apps/workbench/app/views/users/_add_ssh_key_popup.html.erb
@@ -1,7 +1,7 @@
 <div class="modal-dialog modal-with-loading-spinner">
   <div class="modal-content">
 
-    <%= form_tag add_ssh_key_path, {method: :get, id: 'add_new_key_form', name: 'add_new_key_form', class: 'form-search, new_authorized_key', remote: true} do %>
+    <%= form_tag add_ssh_key_path, {method: 'get', id: 'add_new_key_form', name: 'add_new_key_form', class: 'form-search, new_authorized_key', remote: true} do %>
 
       <div class="modal-header">
         <button type="button" class="close" onClick="reset_form()" data-dismiss="modal" aria-hidden="true">×</button>
diff --git a/apps/workbench/app/views/users/_setup_popup.html.erb b/apps/workbench/app/views/users/_setup_popup.html.erb
index f525635..e9429cf 100644
--- a/apps/workbench/app/views/users/_setup_popup.html.erb
+++ b/apps/workbench/app/views/users/_setup_popup.html.erb
@@ -1,7 +1,7 @@
 <div class="modal-dialog modal-with-loading-spinner">
   <div class="modal-content">
 
-    <%= form_tag setup_user_path, {id: 'setup_form', name: 'setup_form', method: :get,
+    <%= form_tag setup_user_path, {id: 'setup_form', name: 'setup_form', method: 'get',
         class: 'form-search', remote: true} do %>
 
     <div class="modal-header">

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


hooks/post-receive
--