diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-04-03 10:36:09 +0300 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-04-03 10:36:09 +0300 |
| commit | fc550b398be6cdc4584dad79411929305815ffaa (patch) | |
| tree | 0995b6990fa3599dddfed5bd2720589731bcdf31 /db/schema.rb | |
| parent | 83d1fe9b5aeb947c1387666205ecaca81f2bf3a2 (diff) | |
| parent | e7e9307219d1c81427f95444b36471c519dc06c2 (diff) | |
Merge branch 'master' into feature/multi-level-container-registry-images
* master: (230 commits)
Fix N+1 query in loading pipelines in merge requests
Fix Spinach and Capybara dependencies
Prevent users from disconnecting gitlab account from CAS
30276 Move issue, mr, todos next to profile dropdown in top nav
Refactor SearchController#show
Properly eagerly-load the Capybara server for JS feature specs only
Updating documentation to include a missing step in the update procedure
Eager-load the Capybara server to prevent timeouts
Increase Capybara's timeout
Add metrics button to Environment Overview page
Fix link to Jira service documentation
Handle parsing OpenBSD ps output properly to display sidekiq infos on ...
Eliminate unnecessary queries that add ~500 ms of load time for a large issue
20914 Limits line length for project home page
Allow users to import GitHub projects to subgroups
Update dpl CI example
Fix the docs:check:links job
Don't clean up the gitlab-test-fork_bare repo
Make GitLab use Gitaly for commit_is_ancestor
Remove unnecessary ORDER BY clause from `forked_to_project_id` subquery
...
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 8f32b62bf14..598ee70872b 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1080,6 +1080,14 @@ ActiveRecord::Schema.define(version: 20170322013926) do add_index "subscriptions", ["subscribable_id", "subscribable_type", "user_id", "project_id"], name: "index_subscriptions_on_subscribable_and_user_id_and_project_id", unique: true, using: :btree + create_table "system_note_metadata", force: :cascade do |t| + t.integer "note_id", null: false + t.integer "commit_count" + t.string "action" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + create_table "taggings", force: :cascade do |t| t.integer "tag_id" t.integer "taggable_id" @@ -1241,6 +1249,7 @@ ActiveRecord::Schema.define(version: 20170322013926) do t.string "organization" t.boolean "authorized_projects_populated" t.boolean "ghost" + t.boolean "notified_of_own_activity" end add_index "users", ["admin"], name: "index_users_on_admin", using: :btree @@ -1312,6 +1321,7 @@ ActiveRecord::Schema.define(version: 20170322013926) do add_foreign_key "protected_branch_merge_access_levels", "protected_branches" add_foreign_key "protected_branch_push_access_levels", "protected_branches" add_foreign_key "subscriptions", "projects", on_delete: :cascade + add_foreign_key "system_note_metadata", "notes", name: "fk_d83a918cb1", 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 "trending_projects", "projects", on_delete: :cascade |