diff options
| author | George Claghorn <george@basecamp.com> | 2017-07-15 08:42:10 -0400 |
|---|---|---|
| committer | George Claghorn <george@basecamp.com> | 2017-07-15 08:42:10 -0400 |
| commit | 6074771f7926d4c93536d15d91de46fb549b329a (patch) | |
| tree | 4fdf5fe7e929cb18344fdbd8618a32aadd064dd7 /lib/active_storage/service | |
| parent | 147b409e00212f932e35ae446eced96704eaaacd (diff) | |
| download | rails-6074771f7926d4c93536d15d91de46fb549b329a.tar.gz rails-6074771f7926d4c93536d15d91de46fb549b329a.tar.bz2 rails-6074771f7926d4c93536d15d91de46fb549b329a.zip | |
Swap branches
Diffstat (limited to 'lib/active_storage/service')
| -rw-r--r-- | lib/active_storage/service/s3_service.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/active_storage/service/s3_service.rb b/lib/active_storage/service/s3_service.rb index f78e2d3246..4efc34eb80 100644 --- a/lib/active_storage/service/s3_service.rb +++ b/lib/active_storage/service/s3_service.rb @@ -10,15 +10,15 @@ class ActiveStorage::Service::S3Service < ActiveStorage::Service access_key_id: access_key_id, secret_access_key: secret_access_key, region: region, - bucket: bucket + bucket: bucket, + endpoint: endpoint ) else Aws::S3::Resource.new( access_key_id: access_key_id, secret_access_key: secret_access_key, region: region, - bucket: bucket, - endpoint: endpoint + bucket: bucket ) end |