diff options
| author | Xavier Noria <fxn@hashref.com> | 2017-08-15 21:57:27 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2017-08-15 22:01:24 +0200 |
| commit | d8bf5d73c39ff6758b3a86a58b1b096006f4bb42 (patch) | |
| tree | a825566b297d6cc4420e745fece2a0686dd7962b /activestorage/app/controllers | |
| parent | 979277dc0349e3674daa21b691478ea7e05f3519 (diff) | |
| download | rails-d8bf5d73c39ff6758b3a86a58b1b096006f4bb42.tar.gz rails-d8bf5d73c39ff6758b3a86a58b1b096006f4bb42.tar.bz2 rails-d8bf5d73c39ff6758b3a86a58b1b096006f4bb42.zip | |
restores some double newlines deleted in ae87217
These were intentional, see
https://github.com/rails/rails/pull/30061#issuecomment-320068368
Diffstat (limited to 'activestorage/app/controllers')
| -rw-r--r-- | activestorage/app/controllers/active_storage/disk_controller.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/activestorage/app/controllers/active_storage/disk_controller.rb b/activestorage/app/controllers/active_storage/disk_controller.rb index dee88054da..b10d4e2cac 100644 --- a/activestorage/app/controllers/active_storage/disk_controller.rb +++ b/activestorage/app/controllers/active_storage/disk_controller.rb @@ -33,6 +33,7 @@ class ActiveStorage::DiskController < ActionController::Base ActiveStorage::Blob.service end + def decode_verified_key ActiveStorage.verifier.verified(params[:encoded_key], purpose: :blob_key) end @@ -41,6 +42,7 @@ class ActiveStorage::DiskController < ActionController::Base params[:disposition].presence_in(%w( inline attachment )) || "inline" end + def decode_verified_token ActiveStorage.verifier.verified(params[:encoded_token], purpose: :blob_token) end |