diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-03-12 16:00:48 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-03-12 16:00:48 +0000 |
| commit | b80c2287958d10626b49a483c8cc9ea306e7aea0 (patch) | |
| tree | c80be7682dd6134ab5c8044e8aec8837ba550af4 /db/schema.rb | |
| parent | 52fa89e8d1872b909c98ddd4bcacc2ab00ac6e57 (diff) | |
| parent | 7f3e6473ca8e25ee7b860cb6ed6416fc1c98f8b2 (diff) | |
| download | gitlab-ce-b80c2287958d10626b49a483c8cc9ea306e7aea0.tar.gz | |
Merge branch '10-6-stable-frozen' into '10-6-stable'
Merge 10-6-stable-frozen into 10-6-stable
See merge request gitlab-org/gitlab-ce!17644
Diffstat (limited to 'db/schema.rb')
| -rw-r--r-- | db/schema.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/db/schema.rb b/db/schema.rb index b27516f47f8..bfd4d2ef38f 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1146,6 +1146,7 @@ ActiveRecord::Schema.define(version: 20180308052825) do t.boolean "discussion_locked" t.integer "latest_merge_request_diff_id" t.string "rebase_commit_sha" + t.boolean "allow_maintainer_to_push" end add_index "merge_requests", ["assignee_id"], name: "index_merge_requests_on_assignee_id", using: :btree @@ -1846,6 +1847,13 @@ ActiveRecord::Schema.define(version: 20180308052825) do add_index "user_custom_attributes", ["key", "value"], name: "index_user_custom_attributes_on_key_and_value", using: :btree add_index "user_custom_attributes", ["user_id", "key"], name: "index_user_custom_attributes_on_user_id_and_key", unique: true, using: :btree + create_table "user_interacted_projects", id: false, force: :cascade do |t| + t.integer "user_id", null: false + t.integer "project_id", null: false + end + + add_index "user_interacted_projects", ["project_id", "user_id"], name: "index_user_interacted_projects_on_project_id_and_user_id", unique: true, using: :btree + create_table "user_synced_attributes_metadata", force: :cascade do |t| t.boolean "name_synced", default: false t.boolean "email_synced", default: false @@ -2118,6 +2126,8 @@ ActiveRecord::Schema.define(version: 20180308052825) do add_foreign_key "u2f_registrations", "users" add_foreign_key "user_callouts", "users", on_delete: :cascade add_foreign_key "user_custom_attributes", "users", on_delete: :cascade + add_foreign_key "user_interacted_projects", "projects", name: "fk_722ceba4f7", on_delete: :cascade + add_foreign_key "user_interacted_projects", "users", name: "fk_0894651f08", on_delete: :cascade add_foreign_key "user_synced_attributes_metadata", "users", on_delete: :cascade add_foreign_key "users_star_projects", "projects", name: "fk_22cd27ddfc", on_delete: :cascade add_foreign_key "web_hook_logs", "web_hooks", on_delete: :cascade |