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

Merge branch 'fix-track-user-migration' into 'master'
4e898b9b · Rémy Coutable · 550466dd · a0260bb5 · 4e898b9b
Commit 4e898b9b authored Jul 18, 2016 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

20160715134306_add_index_for_pipeline_user_id.rb db/migrate/20160715134306_add_index_for_pipeline_user_id.rb +2 -0

No files found.
--- a/db/migrate/20160715134306_add_index_for_pipeline_user_id.rb
+++ b/db/migrate/20160715134306_add_index_for_pipeline_user_id.rb
 class AddIndexForPipelineUserId < ActiveRecord::Migration
  include Gitlab::Database::MigrationHelpers

+  disable_ddl_transaction!
+
  def change
    add_concurrent_index :ci_commits, :user_id
  end