From 6074771f7926d4c93536d15d91de46fb549b329a Mon Sep 17 00:00:00 2001 From: George Claghorn Date: Sat, 15 Jul 2017 08:42:10 -0400 Subject: Swap branches --- lib/active_storage/service/s3_service.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib') 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 -- cgit v1.2.3