diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-01-09 17:01:28 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-02-05 14:12:48 +0000 |
| commit | f9e41d0d851ae0ab1d67df63d0309fdce97517e1 (patch) | |
| tree | 3c71a5853b789ff57d8a47522d8603c36eb7aa59 /config/initializers | |
| parent | f04910f254c29047dd3ae798161683a722e7162b (diff) | |
| download | gitlab-ce-f9e41d0d851ae0ab1d67df63d0309fdce97517e1.tar.gz | |
Allow MR diffs to be placed into an object store
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/1_settings.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 1aed41e02ab..dfcf1e648b4 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -216,6 +216,14 @@ Settings.pages['admin'] ||= Settingslogic.new({}) Settings.pages.admin['certificate'] ||= '' # +# External merge request diffs +# +Settings['external_diffs'] ||= Settingslogic.new({}) +Settings.external_diffs['enabled'] = false if Settings.external_diffs['enabled'].nil? +Settings.external_diffs['storage_path'] = Settings.absolute(Settings.external_diffs['storage_path'] || File.join(Settings.shared['path'], 'external-diffs')) +Settings.external_diffs['object_store'] = ObjectStoreSettings.parse(Settings.external_diffs['object_store']) + +# # Git LFS # Settings['lfs'] ||= Settingslogic.new({}) |