diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-10-18 11:31:49 +0200 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-10-18 11:31:49 +0200 |
commit | df9062d0b50d08a8a484b9780aeb92c53bead530 (patch) | |
tree | 13985b14daf1b1614b35aade3f74a0c80f8eb10c /db/schema.rb | |
parent | ae4fbae26cefbf10848719ee8c06d418c348420c (diff) | |
parent | 38785046f7ec7d834e22add66e4be88f6e985355 (diff) | |
download | gitlab-ce-df9062d0b50d08a8a484b9780aeb92c53bead530.tar.gz |
Merge branch 'master' into jrochkind/gitlab-ce-fix_2839_send_abuse_report_notify
Diffstat (limited to 'db/schema.rb')
-rw-r--r-- | db/schema.rb | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/db/schema.rb b/db/schema.rb index 23627bdaa22..b05fa708775 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: 20151008143519) do +ActiveRecord::Schema.define(version: 20151016195706) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -46,7 +46,6 @@ ActiveRecord::Schema.define(version: 20151008143519) do t.integer "session_expire_delay", default: 10080, null: false t.text "import_sources" t.text "help_page_text" - t.boolean "ci_enabled", default: true, null: false t.string "admin_notification_email" end @@ -101,12 +100,24 @@ ActiveRecord::Schema.define(version: 20151008143519) do t.boolean "allow_failure", default: false, null: false t.string "stage" t.integer "trigger_request_id" + t.integer "stage_idx" + t.boolean "tag" + t.string "ref" + t.integer "user_id" + t.string "type" + t.string "target_url" + t.string "description" end + add_index "ci_builds", ["commit_id", "stage_idx", "created_at"], name: "index_ci_builds_on_commit_id_and_stage_idx_and_created_at", using: :btree + add_index "ci_builds", ["commit_id", "type", "name", "ref"], name: "index_ci_builds_on_commit_id_and_type_and_name_and_ref", using: :btree + add_index "ci_builds", ["commit_id", "type", "ref"], name: "index_ci_builds_on_commit_id_and_type_and_ref", using: :btree add_index "ci_builds", ["commit_id"], name: "index_ci_builds_on_commit_id", using: :btree add_index "ci_builds", ["project_id", "commit_id"], name: "index_ci_builds_on_project_id_and_commit_id", using: :btree add_index "ci_builds", ["project_id"], name: "index_ci_builds_on_project_id", using: :btree add_index "ci_builds", ["runner_id"], name: "index_ci_builds_on_runner_id", using: :btree + add_index "ci_builds", ["status"], name: "index_ci_builds_on_status", using: :btree + add_index "ci_builds", ["type"], name: "index_ci_builds_on_type", using: :btree create_table "ci_commits", force: true do |t| t.integer "project_id" @@ -122,6 +133,7 @@ ActiveRecord::Schema.define(version: 20151008143519) do t.integer "gl_project_id" end + add_index "ci_commits", ["gl_project_id"], name: "index_ci_commits_on_gl_project_id", using: :btree add_index "ci_commits", ["project_id", "committed_at", "id"], name: "index_ci_commits_on_project_id_and_committed_at_and_id", using: :btree add_index "ci_commits", ["project_id", "committed_at"], name: "index_ci_commits_on_project_id_and_committed_at", using: :btree add_index "ci_commits", ["project_id", "sha"], name: "index_ci_commits_on_project_id_and_sha", using: :btree @@ -181,6 +193,9 @@ ActiveRecord::Schema.define(version: 20151008143519) do t.text "generated_yaml_config" end + add_index "ci_projects", ["gitlab_id"], name: "index_ci_projects_on_gitlab_id", using: :btree + add_index "ci_projects", ["shared_runners_enabled"], name: "index_ci_projects_on_shared_runners_enabled", using: :btree + create_table "ci_runner_projects", force: true do |t| t.integer "runner_id", null: false t.integer "project_id", null: false @@ -521,6 +536,7 @@ ActiveRecord::Schema.define(version: 20151008143519) do add_index "notes", ["commit_id"], name: "index_notes_on_commit_id", using: :btree add_index "notes", ["created_at", "id"], name: "index_notes_on_created_at_and_id", using: :btree add_index "notes", ["created_at"], name: "index_notes_on_created_at", using: :btree + add_index "notes", ["line_code"], name: "index_notes_on_line_code", using: :btree add_index "notes", ["noteable_id", "noteable_type"], name: "index_notes_on_noteable_id_and_noteable_type", using: :btree add_index "notes", ["noteable_type"], name: "index_notes_on_noteable_type", using: :btree add_index "notes", ["project_id", "noteable_type"], name: "index_notes_on_project_id_and_noteable_type", using: :btree @@ -754,6 +770,7 @@ ActiveRecord::Schema.define(version: 20151008143519) do t.integer "dashboard", default: 0 t.integer "project_view", default: 0 t.integer "consumed_timestep" + t.integer "layout", default: 0 end add_index "users", ["admin"], name: "index_users_on_admin", using: :btree |