[ARVADOS] updated: 8b030cb82d414bfa0559a205c150f4bfe792caba

[git at public.curoverse.com]

Summary of changes:
 .../app/views/collections/_sharing_popup.html.erb  |    4 ++--
 .../api/app/models/api_client_authorization.rb     |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

       via  8b030cb82d414bfa0559a205c150f4bfe792caba (commit)
      from  871a7250874ec52543bed51c8b6d14a3ab860eb8 (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 8b030cb82d414bfa0559a205c150f4bfe792caba
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu May 8 09:30:36 2014 -0400

    Fixed scope to use request.request_method (the effective request method in
    rails) instead of request.method (the actual HTTP method).  Added word-wrap
    style to popup.

diff --git a/apps/workbench/app/views/collections/_sharing_popup.html.erb b/apps/workbench/app/views/collections/_sharing_popup.html.erb
index 97bcdd1..719f8fb 100644
--- a/apps/workbench/app/views/collections/_sharing_popup.html.erb
+++ b/apps/workbench/app/views/collections/_sharing_popup.html.erb
@@ -1,12 +1,12 @@
 
-<div class="modal-dialog" style="width: 90%">
+<div class="modal-dialog">
   <div class="modal-content">
     <div class="modal-header">
       <button type="button" class="close" onClick="reset_form()" data-dismiss="modal" aria-hidden="true">×</button>
       <h4 class="modal-title">Sharing</h4>
     </div>
     <div class="modal-body">
-      <div id="sharing-text" style="text-align: center">
+      <div id="sharing-text" style="text-align: center; word-wrap: break-word">
         <% if @search_sharing.any? %>
           Use this link to share this collection:<br>
           <big>
diff --git a/services/api/app/models/api_client_authorization.rb b/services/api/app/models/api_client_authorization.rb
index 2488d83..82dd0ec 100644
--- a/services/api/app/models/api_client_authorization.rb
+++ b/services/api/app/models/api_client_authorization.rb
@@ -71,7 +71,7 @@ class ApiClientAuthorization < ArvadosModel
   end
 
   def scopes_allow_request?(request)
-    scopes_allow? [request.method, request.path].join(' ')
+    scopes_allow? [request.request_method, request.path].join(' ')
   end
 
   def logged_attributes

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


hooks/post-receive
--