Merge branch 'feature/gb/migrate-pipeline-stages' into feature/gb/persist-pipeline-stages

* feature/gb/migrate-pipeline-stages:
  Fix reverting builds stage ref migration on MySQL
This commit is contained in:
Grzegorz Bizon 2017-06-06 20:54:23 +02:00
commit 4ef636576a
2 changed files with 1 additions and 2 deletions

View file

@ -13,8 +13,8 @@ class AddStageIdToCiBuilds < ActiveRecord::Migration
end
def down
remove_concurrent_index :ci_builds, :stage_id
remove_foreign_key :ci_builds, column: :stage_id
remove_concurrent_index :ci_builds, :stage_id
remove_column :ci_builds, :stage_id, :integer
end

View file

@ -16,7 +16,6 @@ describe MigrateBuildStageReference, :migration do
#
projects.create!(id: 123, name: 'gitlab1', path: 'gitlab1')
projects.create!(id: 456, name: 'gitlab2', path: 'gitlab2')
projects.create!(id: 798, name: 'gitlab3', path: 'gitlab3')
# Create CI/CD pipelines
#