diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-06-21 12:18:27 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-06-21 12:18:27 +0000 |
| commit | 7d0d6a8245361db0863d0258ffc9d3b669c6477d (patch) | |
| tree | 80817ebee63dd6229f81d247d5592d0ad1e471be /db | |
| parent | 090ed087f0aba10dff142e48d97259fec28b89bb (diff) | |
| parent | 853d06b99f4ea5ab718f15c03bfed42288d527d4 (diff) | |
| download | gitlab-ce-7d0d6a8245361db0863d0258ffc9d3b669c6477d.tar.gz | |
Merge branch 'master' into 'fix/gb/improve-build-stage-reference-migration'
# Conflicts:
# db/schema.rb
Diffstat (limited to 'db')
| -rw-r--r-- | db/fixtures/development/19_environments.rb | 2 | ||||
| -rw-r--r-- | db/migrate/20170619144837_add_index_for_head_pipeline_merge_request.rb | 15 | ||||
| -rw-r--r-- | db/schema.rb | 1 |
3 files changed, 17 insertions, 1 deletions
diff --git a/db/fixtures/development/19_environments.rb b/db/fixtures/development/19_environments.rb index 93214b9d3e7..c1bbc9af6d6 100644 --- a/db/fixtures/development/19_environments.rb +++ b/db/fixtures/development/19_environments.rb @@ -33,7 +33,7 @@ class Gitlab::Seeder::Environments create_deployment!( merge_request.source_project, - "review/#{merge_request.source_branch}", + "review/#{merge_request.source_branch.gsub(/[^a-zA-Z0-9]/, '')}", merge_request.source_branch, merge_request.diff_head_sha ) diff --git a/db/migrate/20170619144837_add_index_for_head_pipeline_merge_request.rb b/db/migrate/20170619144837_add_index_for_head_pipeline_merge_request.rb new file mode 100644 index 00000000000..02863bee082 --- /dev/null +++ b/db/migrate/20170619144837_add_index_for_head_pipeline_merge_request.rb @@ -0,0 +1,15 @@ +class AddIndexForHeadPipelineMergeRequest < ActiveRecord::Migration + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + disable_ddl_transaction! + + def up + add_concurrent_index :merge_requests, :head_pipeline_id + end + + def down + remove_concurrent_index :merge_requests, :head_pipeline_id if index_exists?(:merge_requests, :head_pipeline_id) + end +end diff --git a/db/schema.rb b/db/schema.rb index ec1329892eb..028556bdccf 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -777,6 +777,7 @@ ActiveRecord::Schema.define(version: 20170621102400) do add_index "merge_requests", ["created_at"], name: "index_merge_requests_on_created_at", using: :btree add_index "merge_requests", ["deleted_at"], name: "index_merge_requests_on_deleted_at", using: :btree add_index "merge_requests", ["description"], name: "index_merge_requests_on_description_trigram", using: :gin, opclasses: {"description"=>"gin_trgm_ops"} + add_index "merge_requests", ["head_pipeline_id"], name: "index_merge_requests_on_head_pipeline_id", using: :btree add_index "merge_requests", ["milestone_id"], name: "index_merge_requests_on_milestone_id", using: :btree add_index "merge_requests", ["source_branch"], name: "index_merge_requests_on_source_branch", using: :btree add_index "merge_requests", ["source_project_id"], name: "index_merge_requests_on_source_project_id", using: :btree |