diff options
| author | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-08-30 00:34:29 +0300 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-08-30 00:34:29 +0300 |
| commit | 090956259c47d839b136f9391c3f74255764da81 (patch) | |
| tree | 5a8c5fcd9d90f0ae4ca7e8cefe1261d2d31b504f /db/schema.rb | |
| parent | 21b5239a0016796f1e2b60955f47c7daea318208 (diff) | |
| parent | ce07df77cc4d96d06dacc4319e4e42c23afe850e (diff) | |
Merge branch 'security-enable-image-proxy' into 'master'
Use image proxy to mitigate stealing ip addresses
Closes #2812
See merge request gitlab/gitlabhq!2926
Diffstat (limited to 'db/schema.rb')
| -rw-r--r-- | db/schema.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/db/schema.rb b/db/schema.rb index c6ba36565c0..290ad421c04 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -279,6 +279,11 @@ ActiveRecord::Schema.define(version: 2019_08_16_151221) do t.boolean "allow_local_requests_from_system_hooks", default: true, null: false t.bigint "instance_administration_project_id" t.string "snowplow_collector_hostname" + t.boolean "asset_proxy_enabled", default: false, null: false + t.string "asset_proxy_url" + t.text "asset_proxy_whitelist" + t.text "encrypted_asset_proxy_secret_key" + t.string "encrypted_asset_proxy_secret_key_iv" t.index ["custom_project_templates_group_id"], name: "index_application_settings_on_custom_project_templates_group_id" t.index ["file_template_project_id"], name: "index_application_settings_on_file_template_project_id" t.index ["instance_administration_project_id"], name: "index_applicationsettings_on_instance_administration_project_id" |