diff options
| author | Jeffrey Guenther <guenther.jeffrey@gmail.com> | 2017-11-30 08:43:37 -0800 |
|---|---|---|
| committer | Jeffrey Guenther <guenther.jeffrey@gmail.com> | 2017-11-30 08:43:37 -0800 |
| commit | 241b5f1cebb17449f31e4170671ef70866605f8b (patch) | |
| tree | e939f4aa85f321fd40090d5b5a31ecd25907135d /activestorage/app | |
| parent | 3429ab14a6f2380f4bd924fe9d9ad2eb967ae62b (diff) | |
| parent | f7e3c686685fb89e67293440d24356f93fa34847 (diff) | |
| download | rails-241b5f1cebb17449f31e4170671ef70866605f8b.tar.gz rails-241b5f1cebb17449f31e4170671ef70866605f8b.tar.bz2 rails-241b5f1cebb17449f31e4170671ef70866605f8b.zip | |
Merge branch 'master' into activestorage-guide
Diffstat (limited to 'activestorage/app')
| -rw-r--r-- | activestorage/app/controllers/active_storage/disk_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activestorage/app/controllers/active_storage/disk_controller.rb b/activestorage/app/controllers/active_storage/disk_controller.rb index 8caecfff49..a7e10c0696 100644 --- a/activestorage/app/controllers/active_storage/disk_controller.rb +++ b/activestorage/app/controllers/active_storage/disk_controller.rb @@ -5,7 +5,7 @@ # Always go through the BlobsController, or your own authenticated controller, rather than directly # to the service url. class ActiveStorage::DiskController < ActionController::Base - skip_forgery_protection + skip_forgery_protection if default_protect_from_forgery def show if key = decode_verified_key |