[ARVADOS] updated: 36b4355956d23f3b7402fba0e18318fc70e31e27

[Git user]

Summary of changes:
 apps/workbench/app/controllers/collections_controller.rb | 2 ++
 1 file changed, 2 insertions(+)

       via  36b4355956d23f3b7402fba0e18318fc70e31e27 (commit)
      from  3224524c1a2d6790322448565cb5a16ea0bcb874 (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 36b4355956d23f3b7402fba0e18318fc70e31e27
Author: Lucas Di Pentima <lucas at curoverse.com>
Date:   Thu Aug 10 08:49:09 2017 -0300

    11167: Revert removing ActionController::Live from collections controller
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas at curoverse.com>

diff --git a/apps/workbench/app/controllers/collections_controller.rb b/apps/workbench/app/controllers/collections_controller.rb
index 8025681..5fcb2dc 100644
--- a/apps/workbench/app/controllers/collections_controller.rb
+++ b/apps/workbench/app/controllers/collections_controller.rb
@@ -7,6 +7,8 @@ require "arvados/collection"
 require "uri"
 
 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

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


hooks/post-receive
--