diff options
| author | Mykhailo Formus <mikeformus@gmail.com> | 2018-07-12 09:55:01 +0000 |
|---|---|---|
| committer | Mykhailo Formus <mikeformus@gmail.com> | 2018-07-12 09:55:01 +0000 |
| commit | 7a21f39df92baaa88f9533316e7b19c9c70bd91e (patch) | |
| tree | 090f49a7edc682c31ac29465205c16201bdbe03d /db/schema.rb | |
| parent | 331f8d71b2c778f10b926114caeb718bce7294d6 (diff) | |
| parent | 767ccaa1725048cd2b27fbf1081cba3ba89d2926 (diff) | |
| download | gitlab-ce-mikeformus/gitlab-ce-qa-264.tar.gz | |
Merge branch 'master' into qa-264mikeformus/gitlab-ce-qa-264
Diffstat (limited to 'db/schema.rb')
| -rw-r--r-- | db/schema.rb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/db/schema.rb b/db/schema.rb index 1898dfc6022..d2aa31fae30 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20180702120647) do +ActiveRecord::Schema.define(version: 20180704204006) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -167,6 +167,7 @@ ActiveRecord::Schema.define(version: 20180702120647) do t.boolean "allow_local_requests_from_hooks_and_services", default: false, null: false t.boolean "enforce_terms", default: false t.boolean "mirror_available", default: true, null: false + t.boolean "hide_third_party_offers", default: false, null: false end create_table "audit_events", force: :cascade do |t| @@ -1949,7 +1950,7 @@ ActiveRecord::Schema.define(version: 20180702120647) do create_table "todos", force: :cascade do |t| t.integer "user_id", null: false - t.integer "project_id" + t.integer "project_id", null: false t.integer "target_id" t.string "target_type", null: false t.integer "author_id", null: false @@ -1959,12 +1960,10 @@ ActiveRecord::Schema.define(version: 20180702120647) do t.datetime "updated_at" t.integer "note_id" t.string "commit_id" - t.integer "group_id" end add_index "todos", ["author_id"], name: "index_todos_on_author_id", using: :btree add_index "todos", ["commit_id"], name: "index_todos_on_commit_id", using: :btree - add_index "todos", ["group_id"], name: "index_todos_on_group_id", using: :btree add_index "todos", ["note_id"], name: "index_todos_on_note_id", using: :btree add_index "todos", ["project_id"], name: "index_todos_on_project_id", using: :btree add_index "todos", ["target_type", "target_id"], name: "index_todos_on_target_type_and_target_id", using: :btree @@ -2338,7 +2337,6 @@ ActiveRecord::Schema.define(version: 20180702120647) do add_foreign_key "term_agreements", "users", on_delete: :cascade add_foreign_key "timelogs", "issues", name: "fk_timelogs_issues_issue_id", on_delete: :cascade add_foreign_key "timelogs", "merge_requests", name: "fk_timelogs_merge_requests_merge_request_id", on_delete: :cascade - add_foreign_key "todos", "namespaces", column: "group_id", on_delete: :cascade add_foreign_key "todos", "notes", name: "fk_91d1f47b13", on_delete: :cascade add_foreign_key "todos", "projects", name: "fk_45054f9c45", on_delete: :cascade add_foreign_key "todos", "users", column: "author_id", name: "fk_ccf0373936", on_delete: :cascade |