diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-12 00:07:43 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-12 00:07:43 +0000 |
commit | 2e3cbf7d89815e2915f77677388c49b48f8d20c3 (patch) | |
tree | 03bdbc99e829295e8077b2ec4032300c15b48e37 /db | |
parent | e44bb86539a8fb4cfb06dfe281632b6f206bd0a7 (diff) | |
download | gitlab-ce-2e3cbf7d89815e2915f77677388c49b48f8d20c3.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20191121193110_add_issue_links_type.rb | 17 | ||||
-rw-r--r-- | db/migrate/20191205145647_add_index_to_projects_deploy_keys_deploy_key.rb | 17 | ||||
-rw-r--r-- | db/schema.rb | 2 |
3 files changed, 36 insertions, 0 deletions
diff --git a/db/migrate/20191121193110_add_issue_links_type.rb b/db/migrate/20191121193110_add_issue_links_type.rb new file mode 100644 index 00000000000..61ef2e7d7e8 --- /dev/null +++ b/db/migrate/20191121193110_add_issue_links_type.rb @@ -0,0 +1,17 @@ +# frozen_string_literal: true + +class AddIssueLinksType < ActiveRecord::Migration[5.1] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + disable_ddl_transaction! + + def up + add_column_with_default :issue_links, :link_type, :integer, default: 0, limit: 2 + end + + def down + remove_column :issue_links, :link_type + end +end diff --git a/db/migrate/20191205145647_add_index_to_projects_deploy_keys_deploy_key.rb b/db/migrate/20191205145647_add_index_to_projects_deploy_keys_deploy_key.rb new file mode 100644 index 00000000000..f9cdc226e4d --- /dev/null +++ b/db/migrate/20191205145647_add_index_to_projects_deploy_keys_deploy_key.rb @@ -0,0 +1,17 @@ +# frozen_string_literal: true + +class AddIndexToProjectsDeployKeysDeployKey < ActiveRecord::Migration[5.2] + include Gitlab::Database::MigrationHelpers + + disable_ddl_transaction! + + DOWNTIME = false + + def up + add_concurrent_index :deploy_keys_projects, :deploy_key_id + end + + def down + remove_concurrent_index :deploy_keys_projects, :deploy_key_id + end +end diff --git a/db/schema.rb b/db/schema.rb index c677944bad6..a369db5e4df 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1305,6 +1305,7 @@ ActiveRecord::Schema.define(version: 2019_12_08_071112) do t.datetime "created_at" t.datetime "updated_at" t.boolean "can_push", default: false, null: false + t.index ["deploy_key_id"], name: "index_deploy_keys_projects_on_deploy_key_id" t.index ["project_id"], name: "index_deploy_keys_projects_on_project_id" end @@ -2049,6 +2050,7 @@ ActiveRecord::Schema.define(version: 2019_12_08_071112) do t.integer "target_id", null: false t.datetime "created_at" t.datetime "updated_at" + t.integer "link_type", limit: 2, default: 0, null: false t.index ["source_id", "target_id"], name: "index_issue_links_on_source_id_and_target_id", unique: true t.index ["source_id"], name: "index_issue_links_on_source_id" t.index ["target_id"], name: "index_issue_links_on_target_id" |