diff options
author | Nick Thomas <nick@gitlab.com> | 2018-09-06 11:30:15 +0000 |
---|---|---|
committer | Nick Thomas <nick@gitlab.com> | 2018-09-06 11:30:15 +0000 |
commit | abc2caaa2894ee4bc9902228efc30a022044e7d1 (patch) | |
tree | 1998a120a01f2d12c264d6385623498d225a4817 /config | |
parent | 228d819b5761de1e2362952a9d0f08828c88424d (diff) | |
parent | 262b974123d22b5d6b662b232ca4792d7998a166 (diff) | |
download | gitlab-ce-abc2caaa2894ee4bc9902228efc30a022044e7d1.tar.gz |
Merge branch 'sh-fix-attachments-inline' into 'master'
Fix attachments not displaying inline with Google Cloud Storage
Closes #49957
See merge request gitlab-org/gitlab-ce!21265
Diffstat (limited to 'config')
-rw-r--r-- | config/initializers/carrierwave_patch.rb | 29 | ||||
-rw-r--r-- | config/initializers/fog_google_https_private_urls.rb | 2 |
2 files changed, 30 insertions, 1 deletions
diff --git a/config/initializers/carrierwave_patch.rb b/config/initializers/carrierwave_patch.rb new file mode 100644 index 00000000000..35ffff03abe --- /dev/null +++ b/config/initializers/carrierwave_patch.rb @@ -0,0 +1,29 @@ +# This monkey patches CarrierWave 1.2.3 to make Google Cloud Storage work with +# extra query parameters: +# https://github.com/carrierwaveuploader/carrierwave/pull/2332/files +module CarrierWave + module Storage + class Fog < Abstract + class File + def authenticated_url(options = {}) + if %w(AWS Google Rackspace OpenStack).include?(@uploader.fog_credentials[:provider]) + # avoid a get by using local references + local_directory = connection.directories.new(key: @uploader.fog_directory) + local_file = local_directory.files.new(key: path) + expire_at = ::Fog::Time.now + @uploader.fog_authenticated_url_expiration + case @uploader.fog_credentials[:provider] + when 'AWS', 'Google' + local_file.url(expire_at, options) + when 'Rackspace' + 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 + end + end + end + end + end +end diff --git a/config/initializers/fog_google_https_private_urls.rb b/config/initializers/fog_google_https_private_urls.rb index c65a534b536..682b1050c68 100644 --- a/config/initializers/fog_google_https_private_urls.rb +++ b/config/initializers/fog_google_https_private_urls.rb @@ -9,7 +9,7 @@ module Fog module MonkeyPatch def url(expires, options = {}) requires :key - collection.get_https_url(key, expires) + collection.get_https_url(key, expires, options) end end |