Merge pull request #2377 from stanhu/sh-pass-openstack-options

Pass OpenStack options in get_object_https_url
carrierwaveuploader · Mar 25, 2019 · 14c8650 · 14c8650
2 parents 13a0c14 + 629dba5
commit 14c8650
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/lib/carrierwave/storage/fog.rb b/lib/carrierwave/storage/fog.rb
@@ -200,10 +200,8 @@ def authenticated_url(options = {})
                   warn "Options hash not supported in #{local_file.class}. You may need to upgrade your Fog provider."
                   local_file.url(expire_at)
                 end
-              when 'Rackspace'
+              when 'Rackspace', 'OpenStack'
                 connection.get_object_https_url(@uploader.fog_directory, path, expire_at, options)
-              when 'OpenStack'
-                connection.get_object_https_url(@uploader.fog_directory, path, expire_at)
               else
                 local_file.url(expire_at)
             end