[ARVADOS] updated: c185e2e2eb0a411b40e8d34c5e0bfe31addedcff

git at public.curoverse.com git at public.curoverse.com
Thu Jan 2 17:02:33 EST 2014


Summary of changes:
 .../app/controllers/collections_controller.rb      |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

       via  c185e2e2eb0a411b40e8d34c5e0bfe31addedcff (commit)
       via  b54435b16c3f6b22d4526d543c276c314143d124 (commit)
      from  6376dc9ef711e339c10e17349eee4c0fc022899c (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 c185e2e2eb0a411b40e8d34c5e0bfe31addedcff
Merge: 6376dc9 b54435b
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Jan 2 14:00:42 2014 -0800

    Merge branch '1694-user-agreement'


commit b54435b16c3f6b22d4526d543c276c314143d124
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue Dec 31 09:41:13 2013 -0800

    Do not check for user agreement signature before showing user agreement.
    
    refs #1699

diff --git a/apps/workbench/app/controllers/collections_controller.rb b/apps/workbench/app/controllers/collections_controller.rb
index a5fed9d..763d3a6 100644
--- a/apps/workbench/app/controllers/collections_controller.rb
+++ b/apps/workbench/app/controllers/collections_controller.rb
@@ -1,5 +1,6 @@
 class CollectionsController < ApplicationController
   skip_before_filter :find_object_by_uuid, :only => [:graph]
+  skip_before_filter :check_user_agreements, :only => [:show_file]
 
   def graph
     index

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list