diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-02-28 21:09:34 +0100 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-02-28 21:09:34 +0100 |
| commit | 8af23def1d6450420d06b8de54d23311a978de20 (patch) | |
| tree | 5da743be888022a197e2555bbcd12076a9ca3633 /config | |
| parent | 54a575f1bbba44573ab92dc58a4242f1ee734c5d (diff) | |
| download | gitlab-ce-8af23def1d6450420d06b8de54d23311a978de20.tar.gz | |
Revert "Merge branch '3867-port-to-ce' into 'master'"
This reverts commit 54a575f1bbba44573ab92dc58a4242f1ee734c5d, reversing
changes made to c63af942e5baf7849a94fa99da8494bcba28e3f8.
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 8 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 13 |
2 files changed, 2 insertions, 19 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 33230b9355d..25f4085deb2 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -152,12 +152,6 @@ 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 @@ -650,8 +644,6 @@ 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 5ad46d47cb6..5b4e6b5db88 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -300,10 +300,8 @@ 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['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 +Settings.artifacts['path'] = Settings.absolute(Settings.artifacts['path'] || File.join(Settings.shared['path'], "artifacts")) +Settings.artifacts['max_size'] ||= 100 # in megabytes # # Registry @@ -341,13 +339,6 @@ 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({}) |