diff options
| author | Nick Thomas <nick@gitlab.com> | 2018-11-29 00:10:42 +0300 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2018-11-29 00:10:42 +0300 |
| commit | ec1982c57707ca87e74063c40ace6c37c4ce02ca (patch) | |
| tree | 9552516ee7a6c1a9e9878697b01e806bf6b24cf4 | |
| parent | 8e5137f19d7f98d6e6b0bda579dfa8f65f8f0c5f (diff) | |
CE->EE: resolve conflicts in db/schema.rb
| -rw-r--r-- | db/schema.rb | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/db/schema.rb b/db/schema.rb index dfce9065e76..f77443fad50 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -2031,7 +2031,6 @@ ActiveRecord::Schema.define(version: 20181126153547) do t.index ["user_id"], name: "index_personal_access_tokens_on_user_id", using: :btree end -<<<<<<< .merge_file_CHNeEG create_table "plans", force: :cascade do |t| t.datetime "created_at", null: false t.datetime "updated_at", null: false @@ -2040,13 +2039,13 @@ ActiveRecord::Schema.define(version: 20181126153547) do t.integer "active_pipelines_limit" t.integer "pipeline_size_limit" t.index ["name"], name: "index_plans_on_name", using: :btree -======= + end + create_table "pool_repositories", id: :bigserial, force: :cascade do |t| t.integer "shard_id", null: false t.string "disk_path" t.index ["disk_path"], name: "index_pool_repositories_on_disk_path", unique: true, using: :btree t.index ["shard_id"], name: "index_pool_repositories_on_shard_id", using: :btree ->>>>>>> .merge_file_MMoIlE end create_table "programming_languages", force: :cascade do |t| @@ -3272,17 +3271,13 @@ ActiveRecord::Schema.define(version: 20181126153547) do add_foreign_key "project_mirror_data", "projects", name: "fk_d1aad367d7", on_delete: :cascade add_foreign_key "project_repository_states", "projects", on_delete: :cascade add_foreign_key "project_statistics", "projects", on_delete: :cascade -<<<<<<< .merge_file_CHNeEG add_foreign_key "project_tracing_settings", "projects", on_delete: :cascade - add_foreign_key "projects", "repositories", column: "pool_repository_id", name: "fk_6e5c14658a", on_delete: :nullify + add_foreign_key "projects", "pool_repositories", name: "fk_6e5c14658a", on_delete: :nullify add_foreign_key "prometheus_alert_events", "projects", on_delete: :cascade add_foreign_key "prometheus_alert_events", "prometheus_alerts", on_delete: :cascade add_foreign_key "prometheus_alerts", "environments", on_delete: :cascade add_foreign_key "prometheus_alerts", "projects", on_delete: :cascade add_foreign_key "prometheus_alerts", "prometheus_metrics", on_delete: :cascade -======= - add_foreign_key "projects", "pool_repositories", name: "fk_6e5c14658a", on_delete: :nullify ->>>>>>> .merge_file_MMoIlE add_foreign_key "prometheus_metrics", "projects", on_delete: :cascade add_foreign_key "protected_branch_merge_access_levels", "namespaces", column: "group_id", name: "fk_98f3d044fe", on_delete: :cascade add_foreign_key "protected_branch_merge_access_levels", "protected_branches", name: "fk_8a3072ccb3", on_delete: :cascade @@ -3305,12 +3300,7 @@ ActiveRecord::Schema.define(version: 20181126153547) do add_foreign_key "push_event_payloads", "events", name: "fk_36c74129da", on_delete: :cascade add_foreign_key "push_rules", "projects", name: "fk_83b29894de", on_delete: :cascade add_foreign_key "releases", "projects", name: "fk_47fe2a0596", on_delete: :cascade -<<<<<<< .merge_file_CHNeEG add_foreign_key "remote_mirrors", "projects", name: "fk_43a9aa4ca8", on_delete: :cascade - add_foreign_key "repositories", "shards", on_delete: :restrict -======= - add_foreign_key "remote_mirrors", "projects", on_delete: :cascade ->>>>>>> .merge_file_MMoIlE add_foreign_key "repository_languages", "projects", on_delete: :cascade add_foreign_key "resource_label_events", "epics", on_delete: :cascade add_foreign_key "resource_label_events", "issues", on_delete: :cascade |