diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-02-24 21:14:08 +0100 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-02-24 21:14:08 +0100 |
commit | 40936c5c7037b5cd5c07b26cfa57a95b2333b8c8 (patch) | |
tree | c8c8eb450af513af321cd8022a9025e0404b4046 | |
parent | 2ee842f00df744994ee71d6312d3d3c83ca243ad (diff) | |
download | gitlab-ce-optimise-register-build-service.tar.gz |
Fix db migrationsoptimise-register-build-service
-rw-r--r-- | db/post_migrate/20170224200046_requeue_pending_builds.rb (renamed from db/post_migrate/20170215200045_requeue_pending_builds.rb) | 2 | ||||
-rw-r--r-- | db/schema.rb | 230 |
2 files changed, 15 insertions, 217 deletions
diff --git a/db/post_migrate/20170215200045_requeue_pending_builds.rb b/db/post_migrate/20170224200046_requeue_pending_builds.rb index dccad8701fc..5220702e755 100644 --- a/db/post_migrate/20170215200045_requeue_pending_builds.rb +++ b/db/post_migrate/20170224200046_requeue_pending_builds.rb @@ -1,7 +1,7 @@ # See http://doc.gitlab.com/ce/development/migration_style_guide.html # for more information on how to write migrations for GitLab. -class FillAuthorizedProjects < ActiveRecord::Migration +class RequeuePendingBuilds < ActiveRecord::Migration include Gitlab::Database::MigrationHelpers class Build < ActiveRecord::Base diff --git a/db/schema.rb b/db/schema.rb index 40b652e63fe..60760608239 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: 20170224194647) do +ActiveRecord::Schema.define(version: 20170224200046) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -29,11 +29,10 @@ ActiveRecord::Schema.define(version: 20170224194647) do create_table "appearances", force: :cascade do |t| t.string "title" t.text "description" - t.string "logo" - t.integer "updated_by" - t.datetime "created_at" - t.datetime "updated_at" t.string "header_logo" + t.string "logo" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.text "description_html" end @@ -47,7 +46,6 @@ ActiveRecord::Schema.define(version: 20170224194647) do t.datetime "updated_at" t.string "home_page_url" t.integer "default_branch_protection", default: 2 - t.text "help_text" t.text "restricted_visibility_levels" t.boolean "version_check_enabled", default: true t.integer "max_attachment_size", default: 10, null: false @@ -63,7 +61,6 @@ ActiveRecord::Schema.define(version: 20170224194647) do t.boolean "shared_runners_enabled", default: true, null: false t.integer "max_artifacts_size", default: 100, null: false t.string "runners_registration_token" - t.integer "max_pages_size", default: 100, null: false t.boolean "require_two_factor_authentication", default: false t.integer "two_factor_grace_period", default: 48 t.boolean "metrics_enabled", default: false @@ -91,18 +88,12 @@ ActiveRecord::Schema.define(version: 20170224194647) do t.integer "container_registry_token_expire_delay", default: 5 t.text "after_sign_up_text" t.boolean "user_default_external", default: false, null: false - t.boolean "elasticsearch_indexing", default: false, null: false - t.boolean "elasticsearch_search", default: false, null: false - t.string "elasticsearch_host", default: "localhost" - t.string "elasticsearch_port", default: "9200" t.string "repository_storages", default: "default" t.string "enabled_git_access_protocol" t.boolean "domain_blacklist_enabled", default: false t.text "domain_blacklist" - t.boolean "usage_ping_enabled", default: true, null: false t.boolean "koding_enabled" t.string "koding_url" - t.integer "repository_size_limit", default: 0 t.text "sign_in_text_html" t.text "help_page_text_html" t.text "shared_runners_text_html" @@ -116,42 +107,13 @@ ActiveRecord::Schema.define(version: 20170224194647) do t.string "sidekiq_throttling_queues" t.decimal "sidekiq_throttling_factor" t.boolean "html_emails_enabled", default: true - t.integer "shared_runners_minutes", default: 0, null: false t.string "plantuml_url" t.boolean "plantuml_enabled" + t.integer "max_pages_size", default: 100, null: false t.integer "terminal_max_session_time", default: 0, null: false t.string "default_artifacts_expire_in", default: "0", null: false end - create_table "approvals", force: :cascade do |t| - t.integer "merge_request_id", null: false - t.integer "user_id", null: false - t.datetime "created_at" - t.datetime "updated_at" - end - - create_table "approver_groups", force: :cascade do |t| - t.integer "target_id", null: false - t.string "target_type", null: false - t.integer "group_id", null: false - t.datetime "created_at" - t.datetime "updated_at" - end - - add_index "approver_groups", ["group_id"], name: "index_approver_groups_on_group_id", using: :btree - add_index "approver_groups", ["target_id", "target_type"], name: "index_approver_groups_on_target_id_and_target_type", using: :btree - - create_table "approvers", force: :cascade do |t| - t.integer "target_id", null: false - t.string "target_type" - t.integer "user_id", null: false - t.datetime "created_at" - t.datetime "updated_at" - end - - add_index "approvers", ["target_id", "target_type"], name: "index_approvers_on_target_id_and_target_type", using: :btree - add_index "approvers", ["user_id"], name: "index_approvers_on_user_id", using: :btree - create_table "audit_events", force: :cascade do |t| t.integer "author_id", null: false t.string "type", null: false @@ -180,7 +142,6 @@ ActiveRecord::Schema.define(version: 20170224194647) do t.integer "project_id", null: false t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.string "name", default: "Development", null: false end add_index "boards", ["project_id"], name: "index_boards_on_project_id", using: :btree @@ -289,13 +250,10 @@ ActiveRecord::Schema.define(version: 20170224194647) do t.integer "duration" t.integer "user_id" t.integer "lock_version" - t.integer "trigger_id" - t.text "trigger_variables" end add_index "ci_commits", ["gl_project_id", "ref", "status"], name: "index_ci_commits_on_gl_project_id_and_ref_and_status", using: :btree add_index "ci_commits", ["gl_project_id", "sha"], name: "index_ci_commits_on_gl_project_id_and_sha", using: :btree - add_index "ci_commits", ["gl_project_id", "trigger_id"], name: "index_ci_commits_on_gl_project_id_and_trigger_id", using: :btree add_index "ci_commits", ["gl_project_id"], name: "index_ci_commits_on_gl_project_id", using: :btree add_index "ci_commits", ["status"], name: "index_ci_commits_on_status", using: :btree add_index "ci_commits", ["user_id"], name: "index_ci_commits_on_user_id", using: :btree @@ -432,8 +390,6 @@ ActiveRecord::Schema.define(version: 20170224194647) do t.datetime "created_at" t.datetime "updated_at" t.integer "gl_project_id" - t.integer "owner_id" - t.string "description" end add_index "ci_triggers", ["gl_project_id"], name: "index_ci_triggers_on_gl_project_id", using: :btree @@ -498,7 +454,8 @@ ActiveRecord::Schema.define(version: 20170224194647) do t.string "slug", null: false end - add_index "environments", ["project_id", "name"], name: "index_environments_on_project_id_and_name", using: :btree + add_index "environments", ["project_id", "name"], name: "index_environments_on_project_id_and_name", unique: true, using: :btree + add_index "environments", ["project_id", "slug"], name: "index_environments_on_project_id_and_slug", unique: true, using: :btree create_table "events", force: :cascade do |t| t.string "target_type" @@ -528,49 +485,16 @@ ActiveRecord::Schema.define(version: 20170224194647) do add_index "forked_project_links", ["forked_to_project_id"], name: "index_forked_project_links_on_forked_to_project_id", unique: true, using: :btree - create_table "geo_nodes", force: :cascade do |t| - t.string "schema" - t.string "host" - t.integer "port" - t.string "relative_url_root" - t.boolean "primary" - t.integer "geo_node_key_id" - t.integer "oauth_application_id" - t.integer "system_hook_id" - end - - add_index "geo_nodes", ["host"], name: "index_geo_nodes_on_host", using: :btree - add_index "geo_nodes", ["primary"], name: "index_geo_nodes_on_primary", using: :btree - - create_table "historical_data", force: :cascade do |t| - t.date "date", null: false - t.integer "active_user_count" - t.datetime "created_at" - t.datetime "updated_at" - end - create_table "identities", force: :cascade do |t| t.string "extern_uid" t.string "provider" t.integer "user_id" t.datetime "created_at" t.datetime "updated_at" - t.string "secondary_extern_uid" end add_index "identities", ["user_id"], name: "index_identities_on_user_id", using: :btree - create_table "index_statuses", force: :cascade do |t| - t.integer "project_id", null: false - t.datetime "indexed_at" - t.text "note" - t.string "last_commit" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - end - - add_index "index_statuses", ["project_id"], name: "index_index_statuses_on_project_id", unique: true, using: :btree - create_table "issue_metrics", force: :cascade do |t| t.integer "issue_id", null: false t.datetime "first_mentioned_in_commit_at" @@ -596,7 +520,6 @@ ActiveRecord::Schema.define(version: 20170224194647) do t.string "state" t.integer "iid" t.integer "updated_by_id" - t.integer "weight" t.boolean "confidential", default: false t.datetime "deleted_at" t.date "due_date" @@ -675,15 +598,6 @@ ActiveRecord::Schema.define(version: 20170224194647) do add_index "labels", ["title"], name: "index_labels_on_title", using: :btree add_index "labels", ["type", "project_id"], name: "index_labels_on_type_and_project_id", using: :btree - create_table "ldap_group_links", force: :cascade do |t| - t.string "cn", null: false - t.integer "group_access", null: false - t.integer "group_id", null: false - t.datetime "created_at" - t.datetime "updated_at" - t.string "provider" - end - create_table "lfs_objects", force: :cascade do |t| t.string "oid", null: false t.integer "size", limit: 8, null: false @@ -703,12 +617,6 @@ ActiveRecord::Schema.define(version: 20170224194647) do add_index "lfs_objects_projects", ["project_id"], name: "index_lfs_objects_projects_on_project_id", using: :btree - create_table "licenses", force: :cascade do |t| - t.text "data", null: false - t.datetime "created_at" - t.datetime "updated_at" - end - create_table "lists", force: :cascade do |t| t.integer "board_id", null: false t.integer "label_id" @@ -736,8 +644,6 @@ ActiveRecord::Schema.define(version: 20170224194647) do t.datetime "invite_accepted_at" t.datetime "requested_at" t.date "expires_at" - t.boolean "ldap", default: false, null: false - t.boolean "override", default: false, null: false end add_index "members", ["access_level"], name: "index_members_on_access_level", using: :btree @@ -800,8 +706,6 @@ ActiveRecord::Schema.define(version: 20170224194647) do t.integer "merge_user_id" t.string "merge_commit_sha" t.datetime "deleted_at" - t.integer "approvals_before_merge" - t.string "rebase_commit_sha" t.string "in_progress_merge_commit_sha" t.integer "lock_version" t.text "title_html" @@ -852,14 +756,6 @@ ActiveRecord::Schema.define(version: 20170224194647) do add_index "milestones", ["title"], name: "index_milestones_on_title", using: :btree add_index "milestones", ["title"], name: "index_milestones_on_title_trigram", using: :gin, opclasses: {"title"=>"gin_trgm_ops"} - create_table "namespace_metrics", force: :cascade do |t| - t.integer "namespace_id", null: false - t.integer "shared_runners_minutes", default: 0, null: false - t.datetime "shared_runners_minutes_last_reset" - end - - add_index "namespace_metrics", ["namespace_id"], name: "index_namespace_metrics_on_namespace_id", unique: true, using: :btree - create_table "namespaces", force: :cascade do |t| t.string "name", null: false t.string "path", null: false @@ -869,32 +765,22 @@ ActiveRecord::Schema.define(version: 20170224194647) do t.string "type" t.string "description", default: "", null: false t.string "avatar" - t.boolean "membership_lock", default: false t.boolean "share_with_group_lock", default: false t.integer "visibility_level", default: 20, null: false t.boolean "request_access_enabled", default: false, null: false - t.string "ldap_sync_status", default: "ready", null: false - t.string "ldap_sync_error" - t.datetime "ldap_sync_last_update_at" - t.datetime "ldap_sync_last_successful_update_at" - t.datetime "ldap_sync_last_sync_at" t.datetime "deleted_at" - t.text "description_html" t.boolean "lfs_enabled" - t.integer "repository_size_limit" + t.text "description_html" t.integer "parent_id" - t.integer "shared_runners_minutes_limit" end add_index "namespaces", ["created_at"], name: "index_namespaces_on_created_at", using: :btree add_index "namespaces", ["deleted_at"], name: "index_namespaces_on_deleted_at", using: :btree - add_index "namespaces", ["ldap_sync_last_successful_update_at"], name: "index_namespaces_on_ldap_sync_last_successful_update_at", using: :btree - add_index "namespaces", ["ldap_sync_last_update_at"], name: "index_namespaces_on_ldap_sync_last_update_at", using: :btree - add_index "namespaces", ["name"], name: "index_namespaces_on_name", unique: true, using: :btree + add_index "namespaces", ["name", "parent_id"], name: "index_namespaces_on_name_and_parent_id", unique: true, using: :btree add_index "namespaces", ["name"], name: "index_namespaces_on_name_trigram", using: :gin, opclasses: {"name"=>"gin_trgm_ops"} add_index "namespaces", ["owner_id"], name: "index_namespaces_on_owner_id", using: :btree add_index "namespaces", ["parent_id", "id"], name: "index_namespaces_on_parent_id_and_id", unique: true, using: :btree - add_index "namespaces", ["path"], name: "index_namespaces_on_path", unique: true, using: :btree + add_index "namespaces", ["path"], name: "index_namespaces_on_path", using: :btree add_index "namespaces", ["path"], name: "index_namespaces_on_path_trigram", using: :gin, opclasses: {"path"=>"gin_trgm_ops"} add_index "namespaces", ["type"], name: "index_namespaces_on_type", using: :btree @@ -1001,18 +887,6 @@ ActiveRecord::Schema.define(version: 20170224194647) do add_index "pages_domains", ["domain"], name: "index_pages_domains_on_domain", unique: true, using: :btree - create_table "path_locks", force: :cascade do |t| - t.string "path", null: false - t.integer "project_id" - t.integer "user_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - end - - add_index "path_locks", ["path"], name: "index_path_locks_on_path", using: :btree - add_index "path_locks", ["project_id"], name: "index_path_locks_on_project_id", using: :btree - add_index "path_locks", ["user_id"], name: "index_path_locks_on_user_id", using: :btree - create_table "personal_access_tokens", force: :cascade do |t| t.integer "user_id", null: false t.string "token", null: false @@ -1069,14 +943,6 @@ ActiveRecord::Schema.define(version: 20170224194647) do add_index "project_import_data", ["project_id"], name: "index_project_import_data_on_project_id", using: :btree - create_table "project_metrics", force: :cascade do |t| - t.integer "project_id", null: false - t.integer "shared_runners_minutes", default: 0, null: false - t.datetime "shared_runners_minutes_last_reset" - end - - add_index "project_metrics", ["project_id"], name: "index_project_metrics_on_project_id", unique: true, using: :btree - create_table "project_statistics", force: :cascade do |t| t.integer "project_id", null: false t.integer "namespace_id", null: false @@ -1104,19 +970,9 @@ ActiveRecord::Schema.define(version: 20170224194647) do t.boolean "archived", default: false, null: false t.string "avatar" t.string "import_status" - t.text "merge_requests_template" t.integer "star_count", default: 0, null: false - t.boolean "merge_requests_rebase_enabled", default: false t.string "import_type" t.string "import_source" - t.integer "approvals_before_merge", default: 0, null: false - t.boolean "reset_approvals_on_push", default: true - t.boolean "merge_requests_ff_only_enabled", default: false - t.text "issues_template" - t.boolean "mirror", default: false, null: false - t.datetime "mirror_last_update_at" - t.datetime "mirror_last_successful_update_at" - t.integer "mirror_user_id" t.text "import_error" t.integer "ci_id" t.boolean "shared_runners_enabled", default: true, null: false @@ -1124,7 +980,6 @@ ActiveRecord::Schema.define(version: 20170224194647) do t.string "build_coverage_regex" t.boolean "build_allow_git_fetch", default: true, null: false t.integer "build_timeout", default: 3600, null: false - t.boolean "mirror_trigger_builds", default: false, null: false t.boolean "pending_delete", default: false t.boolean "public_builds", default: true, null: false t.boolean "last_repository_check_failed" @@ -1135,10 +990,8 @@ ActiveRecord::Schema.define(version: 20170224194647) do t.string "repository_storage", default: "default", null: false t.boolean "request_access_enabled", default: false, null: false t.boolean "has_external_wiki" - t.boolean "repository_read_only" t.boolean "lfs_enabled" t.text "description_html" - t.integer "repository_size_limit" t.boolean "only_allow_merge_if_all_discussions_are_resolved" end @@ -1159,27 +1012,21 @@ ActiveRecord::Schema.define(version: 20170224194647) do create_table "protected_branch_merge_access_levels", force: :cascade do |t| t.integer "protected_branch_id", null: false - t.integer "access_level", default: 40 + t.integer "access_level", default: 40, null: false t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.integer "user_id" - t.integer "group_id" end add_index "protected_branch_merge_access_levels", ["protected_branch_id"], name: "index_protected_branch_merge_access", using: :btree - add_index "protected_branch_merge_access_levels", ["user_id"], name: "index_protected_branch_merge_access_levels_on_user_id", using: :btree create_table "protected_branch_push_access_levels", force: :cascade do |t| t.integer "protected_branch_id", null: false - t.integer "access_level", default: 40 + t.integer "access_level", default: 40, null: false t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.integer "user_id" - t.integer "group_id" end add_index "protected_branch_push_access_levels", ["protected_branch_id"], name: "index_protected_branch_push_access", using: :btree - add_index "protected_branch_push_access_levels", ["user_id"], name: "index_protected_branch_push_access_levels_on_user_id", using: :btree create_table "protected_branches", force: :cascade do |t| t.integer "project_id", null: false @@ -1190,24 +1037,6 @@ ActiveRecord::Schema.define(version: 20170224194647) do add_index "protected_branches", ["project_id"], name: "index_protected_branches_on_project_id", using: :btree - create_table "push_rules", force: :cascade do |t| - t.string "force_push_regex" - t.string "delete_branch_regex" - t.string "commit_message_regex" - t.boolean "deny_delete_tag" - t.integer "project_id" - t.datetime "created_at" - t.datetime "updated_at" - t.string "author_email_regex" - t.boolean "member_check", default: false, null: false - t.string "file_name_regex" - t.boolean "is_sample", default: false - t.integer "max_file_size", default: 0, null: false - t.boolean "prevent_secrets", default: false, null: false - end - - add_index "push_rules", ["project_id"], name: "index_push_rules_on_project_id", using: :btree - create_table "releases", force: :cascade do |t| t.string "tag" t.text "description" @@ -1220,23 +1049,6 @@ ActiveRecord::Schema.define(version: 20170224194647) do add_index "releases", ["project_id", "tag"], name: "index_releases_on_project_id_and_tag", using: :btree add_index "releases", ["project_id"], name: "index_releases_on_project_id", using: :btree - create_table "remote_mirrors", force: :cascade do |t| - t.integer "project_id" - t.string "url" - t.boolean "enabled", default: false - t.string "update_status" - t.datetime "last_update_at" - t.datetime "last_successful_update_at" - t.string "last_error" - t.text "encrypted_credentials" - t.string "encrypted_credentials_iv" - t.string "encrypted_credentials_salt" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - end - - add_index "remote_mirrors", ["project_id"], name: "index_remote_mirrors_on_project_id", using: :btree - create_table "routes", force: :cascade do |t| t.integer "source_id", null: false t.string "source_type", null: false @@ -1460,7 +1272,6 @@ ActiveRecord::Schema.define(version: 20170224194647) do t.string "unconfirmed_email" t.boolean "hide_no_ssh_key", default: false t.string "website_url", default: "", null: false - t.datetime "admin_email_unsubscribed_at" t.string "notification_email" t.boolean "hide_no_password", default: false t.boolean "password_automatically_set", default: false @@ -1476,7 +1287,6 @@ ActiveRecord::Schema.define(version: 20170224194647) do t.integer "consumed_timestep" t.integer "layout", default: 0 t.boolean "hide_project_limit", default: false - t.text "note" t.string "unlock_token" t.datetime "otp_grace_period_started_at" t.boolean "ldap_email", default: false, null: false @@ -1485,6 +1295,7 @@ ActiveRecord::Schema.define(version: 20170224194647) do t.string "organization" t.boolean "authorized_projects_populated" t.boolean "notified_of_own_activity", default: false, null: false + t.boolean "ghost" end add_index "users", ["admin"], name: "index_users_on_admin", using: :btree @@ -1523,25 +1334,21 @@ ActiveRecord::Schema.define(version: 20170224194647) do t.boolean "issues_events", default: false, null: false t.boolean "merge_requests_events", default: false, null: false t.boolean "tag_push_events", default: false - t.integer "group_id" t.boolean "note_events", default: false, null: false t.boolean "enable_ssl_verification", default: true t.boolean "build_events", default: false, null: false - t.string "token" t.boolean "wiki_page_events", default: false, null: false + t.string "token" t.boolean "pipeline_events", default: false, null: false t.boolean "confidential_issues_events", default: false, null: false end add_index "web_hooks", ["project_id"], name: "index_web_hooks_on_project_id", using: :btree - add_foreign_key "approver_groups", "namespaces", column: "group_id", on_delete: :cascade add_foreign_key "boards", "projects" - add_foreign_key "ci_commits", "ci_triggers", column: "trigger_id", on_delete: :cascade add_foreign_key "ci_runner_builds", "ci_builds", column: "build_id", on_delete: :cascade add_foreign_key "ci_runner_builds", "ci_runners", column: "runner_id", on_delete: :cascade add_foreign_key "ci_runner_builds", "projects", on_delete: :cascade - add_foreign_key "ci_triggers", "users", column: "owner_id", on_delete: :nullify add_foreign_key "issue_metrics", "issues", on_delete: :cascade add_foreign_key "label_priorities", "labels", on_delete: :cascade add_foreign_key "label_priorities", "projects", on_delete: :cascade @@ -1552,21 +1359,12 @@ ActiveRecord::Schema.define(version: 20170224194647) do add_foreign_key "merge_request_metrics", "merge_requests", on_delete: :cascade add_foreign_key "merge_requests_closing_issues", "issues", on_delete: :cascade add_foreign_key "merge_requests_closing_issues", "merge_requests", on_delete: :cascade - add_foreign_key "namespace_metrics", "namespaces", on_delete: :cascade - add_foreign_key "path_locks", "projects" - add_foreign_key "path_locks", "users" add_foreign_key "personal_access_tokens", "users" add_foreign_key "project_authorizations", "projects", on_delete: :cascade add_foreign_key "project_authorizations", "users", on_delete: :cascade - add_foreign_key "project_metrics", "projects", on_delete: :cascade add_foreign_key "project_statistics", "projects", on_delete: :cascade - add_foreign_key "protected_branch_merge_access_levels", "namespaces", column: "group_id" add_foreign_key "protected_branch_merge_access_levels", "protected_branches" - add_foreign_key "protected_branch_merge_access_levels", "users" - add_foreign_key "protected_branch_push_access_levels", "namespaces", column: "group_id" add_foreign_key "protected_branch_push_access_levels", "protected_branches" - add_foreign_key "protected_branch_push_access_levels", "users" - add_foreign_key "remote_mirrors", "projects" add_foreign_key "subscriptions", "projects", 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 |