diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 04:45:44 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 04:45:44 +0300 |
| commit | 85dc423f7090da0a52c73eb66faf22ddb20efff9 (patch) | |
| tree | 9160f299afd8c80c038f08e1545be119f5e3f1e1 /config/initializers/carrierwave_patch.rb | |
| parent | 15c2c8c66dbe422588e5411eee7e68f1fa440bb8 (diff) | |
Add latest changes from gitlab-org/gitlab@13-4-stable-ee
Diffstat (limited to 'config/initializers/carrierwave_patch.rb')
| -rw-r--r-- | config/initializers/carrierwave_patch.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/config/initializers/carrierwave_patch.rb b/config/initializers/carrierwave_patch.rb index 53fba307926..ad3ff36138f 100644 --- a/config/initializers/carrierwave_patch.rb +++ b/config/initializers/carrierwave_patch.rb @@ -7,7 +7,9 @@ require "carrierwave/storage/fog" # # This patch also incorporates # https://github.com/carrierwaveuploader/carrierwave/pull/2375 to -# provide Azure support. This is already in CarrierWave v2.1.x, but +# provide Azure support +# and https://github.com/carrierwaveuploader/carrierwave/pull/2397 to +# support custom expire_at. This is already in CarrierWave v2.1.x, but # upgrading this gem is a significant task: # https://gitlab.com/gitlab-org/gitlab/-/issues/216067 module CarrierWave @@ -28,7 +30,7 @@ module CarrierWave # 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 + expire_at = options[:expire_at] || ::Fog::Time.now + @uploader.fog_authenticated_url_expiration case @uploader.fog_credentials[:provider] when 'AWS', 'Google' # Older versions of fog-google do not support options as a parameter |