[ARVADOS] updated: 12abd300828412255248e98754b767df5deeba3d

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/controllers/collections_controller.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

       via  12abd300828412255248e98754b767df5deeba3d (commit)
      from  fefdb915c4cdf2c2d92061d9221eacd7cac4682f (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 12abd300828412255248e98754b767df5deeba3d
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Feb 4 11:24:05 2015 -0500

    2659: Split skip_around_filter back into two separate cases. 063c546 was misguided here.

diff --git a/apps/workbench/app/controllers/collections_controller.rb b/apps/workbench/app/controllers/collections_controller.rb
index 6fcede2..613ed98 100644
--- a/apps/workbench/app/controllers/collections_controller.rb
+++ b/apps/workbench/app/controllers/collections_controller.rb
@@ -4,10 +4,11 @@ class CollectionsController < ApplicationController
   include ActionController::Live
 
   skip_around_filter :require_thread_api_token, if: proc { |ctrl|
-    (Rails.configuration.anonymous_user_token and
-     'show' == ctrl.action_name) or
-    %w(show_file show_file_links).include? ctrl.action_name
+    Rails.configuration.anonymous_user_token and
+    'show' == ctrl.action_name
   }
+  skip_around_filter(:require_thread_api_token,
+                     only: [:show_file, :show_file_links])
   skip_before_filter(:find_object_by_uuid,
                      only: [:provenance, :show_file, :show_file_links])
   # We depend on show_file to display the user agreement:

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


hooks/post-receive
--