[ARVADOS] updated: 91a3a6759a0294c28fa55f044c2d611d01054c20

Mon Jul 21 12:03:16 EDT 2014

Summary of changes:
 .../app/assets/javascripts/application.js          |  2 +-
 .../views/application/_projects_tree_menu.html.erb |  2 +-
 .../app/views/layouts/application.html.erb         |  6 +--
 .../test/functional/projects_controller_test.rb    | 19 +++++++
 .../app/controllers/user_sessions_controller.rb    |  6 ++-
 .../api/app/models/api_client_authorization.rb     |  2 +-
 services/api/app/models/arvados_model.rb           | 34 ++++++-------
 services/api/test/fixtures/users.yml               | 10 ++++
 services/api/test/unit/permission_test.rb          | 31 ++++++++++++
 services/fuse/arvados_fuse/__init__.py             |  6 +--
 services/fuse/bin/arv-mount                        | 59 ++++++++++++++++------
 11 files changed, 130 insertions(+), 47 deletions(-)

       via  91a3a6759a0294c28fa55f044c2d611d01054c20 (commit)
       via  a0a03c3668a3cd5956b3bd4677a15d6c86770952 (commit)
       via  8d3335359e3785be35818b0c4519cc499f3f2fa8 (commit)
       via  230ac956317ec9389252240de934edc168098a76 (commit)
       via  1e5c714b22c71578106890a2255c3e5470102af3 (commit)
       via  68aa07e5c152fd573e254614b34b71957b50ad8c (commit)
       via  3c2d73031843545d70a2d38542c79a99f270d207 (commit)
       via  f38d011a7289e2c1819dd7cbb76a738a24e9c825 (commit)
       via  5f65177301647eca4b488b9d33fd62295a9bb081 (commit)
       via  690bfc8b3d22f9b9bf80328b5758462f315cc1b3 (commit)
      from  05e8f8b3b2f18bab495af9b40df54126a41d963f (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 91a3a6759a0294c28fa55f044c2d611d01054c20
Merge: a0a03c3 8d33353
Author: radhika <radhika at curoverse.com>
Date:   Mon Jul 21 12:03:05 2014 -0400

    Merge branch 'master' into 3138-wiselinks


commit a0a03c3668a3cd5956b3bd4677a15d6c86770952
Author: radhika <radhika at curoverse.com>
Date:   Mon Jul 21 12:01:49 2014 -0400

    3138: update page-wrapper for each refresh.

diff --git a/apps/workbench/app/assets/javascripts/application.js b/apps/workbench/app/assets/javascripts/application.js
index 0397850..a041c0c 100644
--- a/apps/workbench/app/assets/javascripts/application.js
+++ b/apps/workbench/app/assets/javascripts/application.js
@@ -180,7 +180,7 @@ jQuery(function($){
     });
 
     $(document).ready(function() {
-        window.wiselinks = new Wiselinks($('#top-nav-wrapper'));
+        window.wiselinks = new Wiselinks();
     });
 
 });
diff --git a/apps/workbench/app/views/layouts/application.html.erb b/apps/workbench/app/views/layouts/application.html.erb
index c850326..0bd1126 100644
--- a/apps/workbench/app/views/layouts/application.html.erb
+++ b/apps/workbench/app/views/layouts/application.html.erb
@@ -43,7 +43,7 @@
   <link href="//netdna.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.css" rel="stylesheet">
 </head>
 <body>
-  <div id="top-nav-wrapper" class="container-fluid">
+  <div class="container-fluid">
     <nav class="navbar navbar-default navbar-fixed-top" role="navigation">
       <div class="navbar-header">
         <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
@@ -52,7 +52,7 @@
           <span class="icon-bar"></span>
           <span class="icon-bar"></span>
         </button>
-        <a class="navbar-brand" data-push="true" data-target="#top-nav-wrapper" href="/"><%= Rails.configuration.site_name.downcase rescue Rails.application.class.parent_name %></a>
+        <a class="navbar-brand" data-push="true" data-target="#page-wrapper" href="/"><%= Rails.configuration.site_name.downcase rescue Rails.application.class.parent_name %></a>
       </div>
 
       <div class="collapse navbar-collapse">

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


hooks/post-receive
-- 


