From 88ad172d0417292fc1bf70a0dfb3877a0ecb7c79 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 5 Aug 2020 09:10:01 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- config/initializers/carrierwave_patch.rb | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 config/initializers/carrierwave_patch.rb (limited to 'config/initializers/carrierwave_patch.rb') diff --git a/config/initializers/carrierwave_patch.rb b/config/initializers/carrierwave_patch.rb new file mode 100644 index 00000000000..94a79e5990d --- /dev/null +++ b/config/initializers/carrierwave_patch.rb @@ -0,0 +1,22 @@ +# frozen_string_literal: true + +require "carrierwave/storage/fog" + +# This pulls in https://github.com/carrierwaveuploader/carrierwave/pull/2504 to support +# sending AWS S3 encryption headers when copying objects. +module CarrierWave + module Storage + class Fog < Abstract + class File + def copy_to(new_path) + connection.copy_object(@uploader.fog_directory, file.key, @uploader.fog_directory, new_path, copy_to_options) + CarrierWave::Storage::Fog::File.new(@uploader, @base, new_path) + end + + def copy_to_options + acl_header.merge(@uploader.fog_attributes) + end + end + end + end +end -- cgit v1.2.1