Commit ee189fd5 authored by Kamil Trzciński's avatar Kamil Trzciński

Merge branch 'fix-uploads-in-gitlab.yml' into 'master'

Fix example config miss-alignment in uploads.object_store.connection

Closes gitlab-development-kit#342

See merge request gitlab-org/gitlab-ce!18622
parents 4c91ea31 5794b1ca
...@@ -184,7 +184,7 @@ production: &base ...@@ -184,7 +184,7 @@ production: &base
# base_dir: uploads/-/system # base_dir: uploads/-/system
object_store: object_store:
enabled: false enabled: false
# remote_directory: uploads # Bucket name remote_directory: uploads # Bucket name
# direct_upload: false # Use Object Storage directly for uploads instead of background uploads if enabled (Default: false) # direct_upload: false # Use Object Storage directly for uploads instead of background uploads if enabled (Default: false)
# background_upload: false # Temporary option to limit automatic upload (Default: true) # background_upload: false # Temporary option to limit automatic upload (Default: true)
# proxy_download: false # Passthrough all downloads via GitLab instead of using Redirects to Object Storage # proxy_download: false # Passthrough all downloads via GitLab instead of using Redirects to Object Storage
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment