diff options
| author | George Claghorn <george.claghorn@gmail.com> | 2019-01-21 01:36:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-21 01:36:30 -0500 |
| commit | 9f0953d320bbc06a77596a93b6fdbcbf315cb06a (patch) | |
| tree | 44d70fc3462b40ba4eb21c8f89795e74f50c9355 /activestorage/app | |
| parent | 2a711ddbc84d40767e2c303f75be30cfd8d51d41 (diff) | |
| parent | ee65ca46e589e14484c80b35c46c9aff26769d86 (diff) | |
| download | rails-9f0953d320bbc06a77596a93b6fdbcbf315cb06a.tar.gz rails-9f0953d320bbc06a77596a93b6fdbcbf315cb06a.tar.bz2 rails-9f0953d320bbc06a77596a93b6fdbcbf315cb06a.zip | |
Merge pull request #34982 from takeyuweb/fix_activestorage_allow_other_host
Fix ArgumentError when using S3Service
Diffstat (limited to 'activestorage/app')
| -rw-r--r-- | activestorage/app/controllers/active_storage/blobs_controller.rb | 2 | ||||
| -rw-r--r-- | activestorage/app/controllers/active_storage/representations_controller.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activestorage/app/controllers/active_storage/blobs_controller.rb b/activestorage/app/controllers/active_storage/blobs_controller.rb index 4fc3fbe824..a8e42d7356 100644 --- a/activestorage/app/controllers/active_storage/blobs_controller.rb +++ b/activestorage/app/controllers/active_storage/blobs_controller.rb @@ -9,6 +9,6 @@ class ActiveStorage::BlobsController < ActiveStorage::BaseController def show expires_in ActiveStorage.service_urls_expire_in - redirect_to @blob.service_url(disposition: params[:disposition]) + redirect_to @blob.service_url(disposition: params[:disposition]), allow_other_host: true end end diff --git a/activestorage/app/controllers/active_storage/representations_controller.rb b/activestorage/app/controllers/active_storage/representations_controller.rb index 98e11e5dbb..d01af5d939 100644 --- a/activestorage/app/controllers/active_storage/representations_controller.rb +++ b/activestorage/app/controllers/active_storage/representations_controller.rb @@ -9,6 +9,6 @@ class ActiveStorage::RepresentationsController < ActiveStorage::BaseController def show expires_in ActiveStorage.service_urls_expire_in - redirect_to @blob.representation(params[:variation_key]).processed.service_url(disposition: params[:disposition]) + redirect_to @blob.representation(params[:variation_key]).processed.service_url(disposition: params[:disposition]), allow_other_host: true end end |