Commit c7222a9b authored by Grzegorz Bizon's avatar Grzegorz Bizon

Merge branch 'dz-cleanup-packages-settings' into 'master'

Remove unused packages config from 1_settings.rb

See merge request gitlab-org/gitlab-ee!7362
parents 7c4aaefe b21df661
......@@ -258,9 +258,6 @@ Settings.uploads['object_store']['remote_directory'] ||= 'uploads'
Settings['packages'] ||= Settingslogic.new({})
Settings.packages['enabled'] = true if Settings.packages['enabled'].nil?
Settings.packages['storage_path'] = Settings.absolute(Settings.packages['storage_path'] || File.join(Settings.shared['path'], "packages"))
# Settings.artifact['path'] is deprecated, use `storage_path` instead
Settings.packages['path'] = Settings.packages['storage_path']
Settings.packages['max_size'] ||= 100 # in megabytes
Settings.packages['object_store'] = ObjectStoreSettings.parse(Settings.packages['object_store'])
#
......
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