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 /db/schema.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 'db/schema.rb')
| -rw-r--r-- | db/schema.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/db/schema.rb b/db/schema.rb index 14ce50b0619..3906976d296 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -284,6 +284,8 @@ ActiveRecord::Schema.define(version: 2019_09_10_000130) do t.text "asset_proxy_whitelist" t.text "encrypted_asset_proxy_secret_key" t.string "encrypted_asset_proxy_secret_key_iv" + t.string "static_objects_external_storage_url", limit: 255 + t.string "static_objects_external_storage_auth_token", limit: 255 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" @@ -3566,6 +3568,7 @@ ActiveRecord::Schema.define(version: 2019_09_10_000130) do t.integer "bot_type", limit: 2 t.string "first_name", limit: 255 t.string "last_name", limit: 255 + t.string "static_object_token", limit: 255 t.index ["accepted_term_id"], name: "index_users_on_accepted_term_id" t.index ["admin"], name: "index_users_on_admin" t.index ["bot_type"], name: "index_users_on_bot_type" @@ -3585,6 +3588,7 @@ ActiveRecord::Schema.define(version: 2019_09_10_000130) do t.index ["state"], name: "index_users_on_state" t.index ["state"], name: "index_users_on_state_and_internal", where: "(ghost IS NOT TRUE)" t.index ["state"], name: "index_users_on_state_and_internal_ee", where: "((ghost IS NOT TRUE) AND (bot_type IS NULL))" + t.index ["static_object_token"], name: "index_users_on_static_object_token", unique: true t.index ["unconfirmed_email"], name: "index_users_on_unconfirmed_email", where: "(unconfirmed_email IS NOT NULL)" t.index ["username"], name: "index_users_on_username" t.index ["username"], name: "index_users_on_username_trigram", opclass: :gin_trgm_ops, using: :gin |