diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-02-06 08:22:21 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-02-06 08:22:21 +0000 |
| commit | 591380a3f1bf1b5220f176f082af297831a1886e (patch) | |
| tree | 4bcf4ccf030d6df6ac5a784009fd33d2ca7a12fa /config/initializers | |
| parent | d0187de202d94fa445a28c347b7a54dbf09a22a8 (diff) | |
| parent | f9e41d0d851ae0ab1d67df63d0309fdce97517e1 (diff) | |
| download | gitlab-ce-591380a3f1bf1b5220f176f082af297831a1886e.tar.gz | |
Merge branch '52568-external-mr-diffs' into 'master'
Allow merge request diffs to be placed into an object store
Closes #52568
See merge request gitlab-org/gitlab-ce!24276
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({}) |