diff options
| author | Micaël Bergeron <mbergeron@gitlab.com> | 2018-01-29 12:57:34 -0500 |
|---|---|---|
| committer | Micaël Bergeron <mbergeron@gitlab.com> | 2018-02-01 12:14:46 -0500 |
| commit | 2057a6acdee7c1f6824ff6289b0d979e8cb15f35 (patch) | |
| tree | 25b911b147bfa0797dfee4cacf99f23ae5f55281 /config | |
| parent | 402f3dfc0a962dc89d8334d4d61410e67e14a55f (diff) | |
| download | gitlab-ce-2057a6acdee7c1f6824ff6289b0d979e8cb15f35.tar.gz | |
port of 594e6a0a625^..f74c90f68c6
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 8 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 13 |
2 files changed, 19 insertions, 2 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 25f4085deb2..33230b9355d 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -152,6 +152,12 @@ production: &base # The location where LFS objects are stored (default: shared/lfs-objects). # storage_path: shared/lfs-objects + ## 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 @@ -644,6 +650,8 @@ test: enabled: false artifacts: path: tmp/tests/artifacts + uploads: + storage_path: tmp/tests/public gitlab: host: localhost port: 80 diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 5b4e6b5db88..5ad46d47cb6 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -300,8 +300,10 @@ Settings.incoming_email['enabled'] = false if Settings.incoming_email['enabled'] # Settings['artifacts'] ||= Settingslogic.new({}) Settings.artifacts['enabled'] = true if Settings.artifacts['enabled'].nil? -Settings.artifacts['path'] = Settings.absolute(Settings.artifacts['path'] || File.join(Settings.shared['path'], "artifacts")) -Settings.artifacts['max_size'] ||= 100 # in megabytes +Settings.artifacts['storage_path'] = Settings.absolute(Settings.artifacts.values_at('path', 'storage_path').compact.first || File.join(Settings.shared['path'], "artifacts")) +# Settings.artifact['path'] is deprecated, use `storage_path` instead +Settings.artifacts['path'] = Settings.artifacts['storage_path'] +Settings.artifacts['max_size'] ||= 100 # in megabytes # # Registry @@ -339,6 +341,13 @@ Settings.lfs['enabled'] = true if Settings.lfs['enabled'].nil? Settings.lfs['storage_path'] = Settings.absolute(Settings.lfs['storage_path'] || File.join(Settings.shared['path'], "lfs-objects")) # +# Uploads +# +Settings['uploads'] ||= Settingslogic.new({}) +Settings.uploads['storage_path'] = Settings.absolute(Settings.uploads['storage_path'] || 'public') +Settings.uploads['base_dir'] = Settings.uploads['base_dir'] || 'uploads/-/system' + +# # Mattermost # Settings['mattermost'] ||= Settingslogic.new({}) |