diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-07-18 12:31:07 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-07-18 12:31:07 +0000 |
| commit | 4e898b9b5e1a782d226212ba6227a8ddcb5177ae (patch) | |
| tree | 24ef4737c07e0ec2abaf4ca4f4aeda06363ded01 | |
| parent | 550466dd34cb97d4704644b292ab1ef271222981 (diff) | |
| parent | a0260bb57777ae66353bbcd079405702cc6800d7 (diff) | |
| download | gitlab-ce-4e898b9b5e1a782d226212ba6227a8ddcb5177ae.tar.gz | |
Merge branch 'fix-track-user-migration' into 'master'
Disable transaction when adding index for Ci::Pipeline
## What does this MR do?
Adds missing `disable_ddl_transaction!`
## Why was this MR needed?
Fixes a broken migration for PostgreSQL
See merge request !5319
| -rw-r--r-- | db/migrate/20160715134306_add_index_for_pipeline_user_id.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/db/migrate/20160715134306_add_index_for_pipeline_user_id.rb b/db/migrate/20160715134306_add_index_for_pipeline_user_id.rb index e09caa0e6d7..7c991c6d998 100644 --- a/db/migrate/20160715134306_add_index_for_pipeline_user_id.rb +++ b/db/migrate/20160715134306_add_index_for_pipeline_user_id.rb @@ -1,6 +1,8 @@ class AddIndexForPipelineUserId < ActiveRecord::Migration include Gitlab::Database::MigrationHelpers + disable_ddl_transaction! + def change add_concurrent_index :ci_commits, :user_id end |