diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2017-07-24 11:14:29 -0500 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2017-07-24 11:14:29 -0500 |
| commit | d0e90b4a9dc1accd4f1044fde0dd9a347cd0afcf (patch) | |
| tree | 76bfb4f3437973ce960cc1fd570c728feb587fd3 /app/controllers | |
| parent | 69922fc7154fb0b99031b3215f42bb0124715608 (diff) | |
| download | rails-d0e90b4a9dc1accd4f1044fde0dd9a347cd0afcf.tar.gz rails-d0e90b4a9dc1accd4f1044fde0dd9a347cd0afcf.tar.bz2 rails-d0e90b4a9dc1accd4f1044fde0dd9a347cd0afcf.zip | |
Blob/Variant#url -> #service_url to emphasize this URL isn't to be public
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/active_storage/blobs_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/active_storage/direct_uploads_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/active_storage/variants_controller.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/active_storage/blobs_controller.rb b/app/controllers/active_storage/blobs_controller.rb index 5a527d0a33..cf5c008841 100644 --- a/app/controllers/active_storage/blobs_controller.rb +++ b/app/controllers/active_storage/blobs_controller.rb @@ -5,7 +5,7 @@ class ActiveStorage::BlobsController < ActionController::Base def show if blob = find_signed_blob - redirect_to blob.url(disposition: disposition_param) + redirect_to blob.service_url(disposition: disposition_param) else head :not_found end diff --git a/app/controllers/active_storage/direct_uploads_controller.rb b/app/controllers/active_storage/direct_uploads_controller.rb index 0d1b806f9f..d42c52913a 100644 --- a/app/controllers/active_storage/direct_uploads_controller.rb +++ b/app/controllers/active_storage/direct_uploads_controller.rb @@ -4,7 +4,7 @@ class ActiveStorage::DirectUploadsController < ActionController::Base def create blob = ActiveStorage::Blob.create_before_direct_upload!(blob_args) - render json: { upload_to_url: blob.url_for_direct_upload, signed_blob_id: blob.signed_id } + render json: { upload_to_url: blob.service_url_for_direct_upload, signed_blob_id: blob.signed_id } end private diff --git a/app/controllers/active_storage/variants_controller.rb b/app/controllers/active_storage/variants_controller.rb index a65d7d7571..5d5dd1a63c 100644 --- a/app/controllers/active_storage/variants_controller.rb +++ b/app/controllers/active_storage/variants_controller.rb @@ -3,7 +3,7 @@ require "active_storage/variant" class ActiveStorage::VariantsController < ActionController::Base def show if blob = find_signed_blob - redirect_to ActiveStorage::Variant.new(blob, decoded_variation).processed.url(disposition: disposition_param) + redirect_to ActiveStorage::Variant.new(blob, decoded_variation).processed.service_url(disposition: disposition_param) else head :not_found end |