diff options
| author | Andrew White <pixeltrix@users.noreply.github.com> | 2018-04-07 08:20:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-07 08:20:16 +0100 |
| commit | ec7c89b5160015c014aad0c90f5679252a91cb37 (patch) | |
| tree | d78e92d398270a1484027eda29100b5f8e33ae13 /activestorage/app | |
| parent | cb2f69659e01a9ec4b09c70f2357b426ca9a1264 (diff) | |
| parent | 9436c22e2aa9419f275186967a1b863bc3d01ecb (diff) | |
| download | rails-ec7c89b5160015c014aad0c90f5679252a91cb37.tar.gz rails-ec7c89b5160015c014aad0c90f5679252a91cb37.tar.bz2 rails-ec7c89b5160015c014aad0c90f5679252a91cb37.zip | |
Merge pull request #32350 from rails/use-current-model-for-as-url-host
Use an ActiveSupport::CurrentAttributes model to provide the host for service urls
Diffstat (limited to 'activestorage/app')
| -rw-r--r-- | activestorage/app/controllers/active_storage/base_controller.rb | 4 | ||||
| -rw-r--r-- | activestorage/app/models/active_storage/current.rb | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/activestorage/app/controllers/active_storage/base_controller.rb b/activestorage/app/controllers/active_storage/base_controller.rb index ba825883b9..59312ac8df 100644 --- a/activestorage/app/controllers/active_storage/base_controller.rb +++ b/activestorage/app/controllers/active_storage/base_controller.rb @@ -3,4 +3,8 @@ # The base controller for all ActiveStorage controllers. class ActiveStorage::BaseController < ActionController::Base protect_from_forgery with: :exception + + before_action do + ActiveStorage::Current.host = request.base_url + end end diff --git a/activestorage/app/models/active_storage/current.rb b/activestorage/app/models/active_storage/current.rb new file mode 100644 index 0000000000..7e431d8462 --- /dev/null +++ b/activestorage/app/models/active_storage/current.rb @@ -0,0 +1,5 @@ +# frozen_string_literal: true + +class ActiveStorage::Current < ActiveSupport::CurrentAttributes #:nodoc: + attribute :host +end |