diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-04 00:07:29 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-04 00:07:29 +0300 |
| commit | 1da3754b25657f49afdcb0b942506d365b1ee89d (patch) | |
| tree | 9f4bfa94fdd1762ef99e6a61bf180ac8cd7b5616 /db | |
| parent | 25521def84a6987fe9d4265b560e930bfb32c195 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db')
| -rw-r--r-- | db/migrate/20190918102042_create_grafana_integrations.rb | 15 | ||||
| -rw-r--r-- | db/schema.rb | 11 |
2 files changed, 26 insertions, 0 deletions
diff --git a/db/migrate/20190918102042_create_grafana_integrations.rb b/db/migrate/20190918102042_create_grafana_integrations.rb new file mode 100644 index 00000000000..aac27d129db --- /dev/null +++ b/db/migrate/20190918102042_create_grafana_integrations.rb @@ -0,0 +1,15 @@ +# frozen_string_literal: true + +class CreateGrafanaIntegrations < ActiveRecord::Migration[5.2] + DOWNTIME = false + + def change + create_table :grafana_integrations do |t| + t.references :project, index: true, foreign_key: { on_delete: :cascade }, unique: true, null: false + t.timestamps_with_timezone null: false + t.string :encrypted_token, limit: 255, null: false + t.string :encrypted_token_iv, limit: 255, null: false + t.string :grafana_url, null: false, limit: 1024 + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 8c22fe80381..4ca75ece3f9 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1704,6 +1704,16 @@ ActiveRecord::Schema.define(version: 2019_09_27_074328) do t.index ["project_id"], name: "index_gpg_signatures_on_project_id" end + create_table "grafana_integrations", force: :cascade do |t| + t.bigint "project_id", null: false + t.datetime_with_timezone "created_at", null: false + t.datetime_with_timezone "updated_at", null: false + t.string "encrypted_token", limit: 255, null: false + t.string "encrypted_token_iv", limit: 255, null: false + t.string "grafana_url", limit: 1024, null: false + t.index ["project_id"], name: "index_grafana_integrations_on_project_id" + end + create_table "group_custom_attributes", id: :serial, force: :cascade do |t| t.datetime_with_timezone "created_at", null: false t.datetime_with_timezone "updated_at", null: false @@ -3997,6 +4007,7 @@ ActiveRecord::Schema.define(version: 2019_09_27_074328) do add_foreign_key "gpg_signatures", "gpg_key_subkeys", on_delete: :nullify add_foreign_key "gpg_signatures", "gpg_keys", on_delete: :nullify add_foreign_key "gpg_signatures", "projects", on_delete: :cascade + add_foreign_key "grafana_integrations", "projects", on_delete: :cascade add_foreign_key "group_custom_attributes", "namespaces", column: "group_id", on_delete: :cascade add_foreign_key "identities", "saml_providers", name: "fk_aade90f0fc", on_delete: :cascade add_foreign_key "import_export_uploads", "projects", on_delete: :cascade |