diff options
| author | Thong Kuah <tkuah@gitlab.com> | 2019-09-11 22:35:10 +0000 |
|---|---|---|
| committer | Thong Kuah <tkuah@gitlab.com> | 2019-09-11 22:35:10 +0000 |
| commit | eef1a7fe2c0964e0b507e3d7e557fc437570454c (patch) | |
| tree | 6a1e5fdfb8014e68d75d6fca2a612d0824deff96 /app/helpers/application_settings_helper.rb | |
| parent | 6c89bc7eae70ad9a63c4014d6457a80c18412fe5 (diff) | |
| parent | 3c2b4a1cede956d5160ccf08d0a561bf31248161 (diff) | |
| download | gitlab-ce-eef1a7fe2c0964e0b507e3d7e557fc437570454c.tar.gz | |
Merge branch 'static-objects-external-storage' into 'master'
Enable serving static objects from an external storage
See merge request gitlab-org/gitlab-ce!31025
Diffstat (limited to 'app/helpers/application_settings_helper.rb')
| -rw-r--r-- | app/helpers/application_settings_helper.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb index b1a6e988a1d..93e282e44be 100644 --- a/app/helpers/application_settings_helper.rb +++ b/app/helpers/application_settings_helper.rb @@ -168,6 +168,8 @@ module ApplicationSettingsHelper :asset_proxy_secret_key, :asset_proxy_url, :asset_proxy_whitelist, + :static_objects_external_storage_auth_token, + :static_objects_external_storage_url, :authorized_keys_enabled, :auto_devops_enabled, :auto_devops_domain, |