diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-07-25 12:07:29 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-07-25 12:07:29 +0000 |
| commit | 8ce5b4f1a30c0ab904f67c544a6b7de1bb49e664 (patch) | |
| tree | fc9625d19726506d7d459327ec972071e6a3175a /db | |
| parent | 83180110348af1b244d56e9cdf5f29c5d6f84db0 (diff) | |
| parent | 850813d29867aac5935e1128880784f97071a6d8 (diff) | |
| download | gitlab-ce-8ce5b4f1a30c0ab904f67c544a6b7de1bb49e664.tar.gz | |
Merge branch 'filter-branch-by-name' into 'master'
Users can filter branches by name on project branches page
This MR aims to solve #18674 by adding the possibility to filter project branches by name
See merge request !5144
Diffstat (limited to 'db')
| -rw-r--r-- | db/schema.rb | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/db/schema.rb b/db/schema.rb index d541e1cccb7..b87f8108bb2 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -84,7 +84,7 @@ ActiveRecord::Schema.define(version: 20160721081015) do t.string "health_check_access_token" t.boolean "send_user_confirmation_email", default: false t.integer "container_registry_token_expire_delay", default: 5 - t.boolean "user_default_external", default: false, null: false + t.boolean "user_default_external", default: false, null: false t.text "after_sign_up_text" t.string "repository_storage", default: "default" t.string "enabled_git_access_protocol" @@ -607,9 +607,9 @@ ActiveRecord::Schema.define(version: 20160721081015) do add_index "merge_request_diffs", ["merge_request_id"], name: "index_merge_request_diffs_on_merge_request_id", unique: true, using: :btree create_table "merge_requests", force: :cascade do |t| - t.string "target_branch", null: false - t.string "source_branch", null: false - t.integer "source_project_id", null: false + t.string "target_branch", null: false + t.string "source_branch", null: false + t.integer "source_project_id", null: false t.integer "author_id" t.integer "assignee_id" t.string "title" @@ -618,20 +618,21 @@ ActiveRecord::Schema.define(version: 20160721081015) do t.integer "milestone_id" t.string "state" t.string "merge_status" - t.integer "target_project_id", null: false + t.integer "target_project_id", null: false t.integer "iid" t.text "description" - t.integer "position", default: 0 + t.integer "position", default: 0 t.datetime "locked_at" t.integer "updated_by_id" t.string "merge_error" t.text "merge_params" - t.boolean "merge_when_build_succeeds", default: false, null: false + t.boolean "merge_when_build_succeeds", default: false, null: false t.integer "merge_user_id" t.string "merge_commit_sha" t.datetime "deleted_at" t.string "in_progress_merge_commit_sha" end + add_index "merge_requests", ["assignee_id"], name: "index_merge_requests_on_assignee_id", using: :btree add_index "merge_requests", ["author_id"], name: "index_merge_requests_on_author_id", using: :btree add_index "merge_requests", ["created_at", "id"], name: "index_merge_requests_on_created_at_and_id", using: :btree |