diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 09:09:38 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 09:09:38 +0000 |
| commit | 38de2aa494589f6e250a1b11862cbab83c2ae4d1 (patch) | |
| tree | 02794d498d732eea1d8be8e10454e007b4e6e0fa /lib/object_storage | |
| parent | b8520295072b31b11a1ad89770815aae17411979 (diff) | |
| download | gitlab-ce-38de2aa494589f6e250a1b11862cbab83c2ae4d1.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/object_storage')
| -rw-r--r-- | lib/object_storage/config.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/object_storage/config.rb b/lib/object_storage/config.rb index cc536ce9b46..f933d4e4866 100644 --- a/lib/object_storage/config.rb +++ b/lib/object_storage/config.rb @@ -93,6 +93,11 @@ module ObjectStorage private + # This returns a Hash of HTTP encryption headers to send along to S3. + # + # They can also be passed in as Fog::AWS::Storage::File attributes, since there + # are aliases defined for them: + # https://github.com/fog/fog-aws/blob/ab288f29a0974d64fd8290db41080e5578be9651/lib/fog/aws/models/storage/file.rb#L24-L25 def aws_server_side_encryption_headers { 'x-amz-server-side-encryption' => server_side_encryption, |