diff options
| author | Micaël Bergeron <mbergeron@gitlab.com> | 2018-03-22 09:03:06 -0400 |
|---|---|---|
| committer | Micaël Bergeron <mbergeron@gitlab.com> | 2018-03-22 09:03:06 -0400 |
| commit | 6801a93e5e7447199b091e44f33c96d22a1a1960 (patch) | |
| tree | 50c1311091192eda6ae4e60e970549588ac0ac61 /config/initializers/1_settings.rb | |
| parent | 462b04f5b483c5bfa5518d6e3eff439c7200454f (diff) | |
| download | gitlab-ce-6801a93e5e7447199b091e44f33c96d22a1a1960.tar.gz | |
apply feedback
Diffstat (limited to 'config/initializers/1_settings.rb')
| -rw-r--r-- | config/initializers/1_settings.rb | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 676422a92b1..6b4bca8590d 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -313,13 +313,6 @@ Settings.artifacts['object_store']['proxy_download'] = false if Settings.artifac # Convert upload connection settings to use string keys, to make Fog happy Settings.artifacts['object_store']['connection']&.deep_stringify_keys! -Settings.artifacts['object_store'] ||= Settingslogic.new({}) -Settings.artifacts['object_store']['enabled'] = false if Settings.artifacts['object_store']['enabled'].nil? -Settings.artifacts['object_store']['remote_directory'] ||= nil -Settings.artifacts['object_store']['background_upload'] = true if Settings.artifacts['object_store']['background_upload'].nil? -# Convert upload connection settings to use string keys, to make Fog happy -Settings.artifacts['object_store']['connection']&.deep_stringify_keys! - # # Registry # |