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/gitlab.yml.example | 3 +++ 1 file changed, 3 insertions(+) (limited to 'config/gitlab.yml.example') diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 7ba256b39cd..e16a254e256 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -218,6 +218,9 @@ production: &base # region: us-east-1 # aws_signature_version: 4 # For creation of signed URLs. Set to 2 if provider does not support v4. # endpoint: 'https://s3.amazonaws.com' # default: nil - Useful for S3 compliant services such as DigitalOcean Spaces + # storage_options: + # server_side_encryption: AES256 # AES256, aws:kms + # server_side_encryption_kms_key_id: # Amazon Resource Name. See https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingKMSEncryption.html # objects: # artifacts: # bucket: artifacts -- cgit v1.2.1