diff options
author | Shinya Maeda <shinya@gitlab.com> | 2018-06-02 11:15:53 +0900 |
---|---|---|
committer | Shinya Maeda <shinya@gitlab.com> | 2018-06-02 11:15:53 +0900 |
commit | b02b2602c1bcfd60b760fbfd1aca936475d78474 (patch) | |
tree | 09d906b8d6fafcae31994cf0c2af6af2af6970fd /db/schema.rb | |
parent | c89e57842ebf7f395363bcddaeff76bc7b3f7890 (diff) | |
parent | fe0ebf76c49e2512b211c5d43152275c536f7e3a (diff) | |
download | gitlab-ce-b02b2602c1bcfd60b760fbfd1aca936475d78474.tar.gz |
Merge branch 'master' into per-project-pipeline-iid
Diffstat (limited to 'db/schema.rb')
-rw-r--r-- | db/schema.rb | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/db/schema.rb b/db/schema.rb index 53bdb084eea..0d6b44d1b92 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -637,6 +637,17 @@ ActiveRecord::Schema.define(version: 20180529093006) do t.string "external_ip" end + create_table "clusters_applications_jupyter", force: :cascade do |t| + t.integer "cluster_id", null: false + t.integer "oauth_application_id" + t.integer "status", null: false + t.string "version", null: false + t.string "hostname" + t.datetime_with_timezone "created_at", null: false + t.datetime_with_timezone "updated_at", null: false + t.text "status_reason" + end + create_table "clusters_applications_prometheus", force: :cascade do |t| t.integer "cluster_id", null: false t.integer "status", null: false @@ -2198,6 +2209,8 @@ ActiveRecord::Schema.define(version: 20180529093006) do add_foreign_key "clusters", "users", on_delete: :nullify add_foreign_key "clusters_applications_helm", "clusters", on_delete: :cascade add_foreign_key "clusters_applications_ingress", "clusters", name: "fk_753a7b41c1", on_delete: :cascade + add_foreign_key "clusters_applications_jupyter", "clusters", on_delete: :cascade + add_foreign_key "clusters_applications_jupyter", "oauth_applications", on_delete: :nullify add_foreign_key "clusters_applications_prometheus", "clusters", name: "fk_557e773639", on_delete: :cascade add_foreign_key "clusters_applications_runners", "ci_runners", column: "runner_id", name: "fk_02de2ded36", on_delete: :nullify add_foreign_key "clusters_applications_runners", "clusters", on_delete: :cascade |