Commit 827b68e2 authored by Sean McGivern's avatar Sean McGivern

Merge branch '4806-duplicated-uploads-section-in-gitlab-yml-example' into 'master'

Resolve "Duplicated uploads section in gitlab.yml.example"

Closes #4806

See merge request gitlab-org/gitlab-ee!4380
parents 3280c094 7d4e41f8
......@@ -193,12 +193,6 @@ production: &base
# endpoint: 'http://127.0.0.1:9000' # default: nil
# path_style: true # Use 'host/bucket_name/object' instead of 'bucket_name.host/object'
## Uploads (attachments, avatars, etc...)
uploads:
# The location where uploads objects are stored (default: public/).
# storage_path: public/
# base_dir: uploads/-/system
## GitLab Pages
pages:
enabled: false
......
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