From e33c3cd8ccbecaca6c6af0438956431b02cb3fb2 Mon Sep 17 00:00:00 2001 From: George Claghorn Date: Thu, 16 Aug 2018 01:41:15 -0400 Subject: Extract ActiveStorage::SetCurrent Provide a handy concern for custom Active Storage controllers that can't inherit from ActiveStorage::BaseController. --- activestorage/app/controllers/active_storage/base_controller.rb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'activestorage/app/controllers/active_storage/base_controller.rb') diff --git a/activestorage/app/controllers/active_storage/base_controller.rb b/activestorage/app/controllers/active_storage/base_controller.rb index 59312ac8df..b27d2bd8aa 100644 --- a/activestorage/app/controllers/active_storage/base_controller.rb +++ b/activestorage/app/controllers/active_storage/base_controller.rb @@ -1,10 +1,8 @@ # frozen_string_literal: true -# The base controller for all ActiveStorage controllers. +# The base class for all Active Storage controllers. class ActiveStorage::BaseController < ActionController::Base - protect_from_forgery with: :exception + include ActiveStorage::SetCurrent - before_action do - ActiveStorage::Current.host = request.base_url - end + protect_from_forgery with: :exception end -- cgit v1.2.3