Commit 4ef63657 authored by Grzegorz Bizon's avatar Grzegorz Bizon

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
parents 602724fc da8bd81f
...@@ -13,8 +13,8 @@ class AddStageIdToCiBuilds < ActiveRecord::Migration ...@@ -13,8 +13,8 @@ class AddStageIdToCiBuilds < ActiveRecord::Migration
end end
def down def down
remove_concurrent_index :ci_builds, :stage_id
remove_foreign_key :ci_builds, column: :stage_id remove_foreign_key :ci_builds, column: :stage_id
remove_concurrent_index :ci_builds, :stage_id
remove_column :ci_builds, :stage_id, :integer remove_column :ci_builds, :stage_id, :integer
end end
......
...@@ -16,7 +16,6 @@ describe MigrateBuildStageReference, :migration do ...@@ -16,7 +16,6 @@ describe MigrateBuildStageReference, :migration do
# #
projects.create!(id: 123, name: 'gitlab1', path: 'gitlab1') projects.create!(id: 123, name: 'gitlab1', path: 'gitlab1')
projects.create!(id: 456, name: 'gitlab2', path: 'gitlab2') projects.create!(id: 456, name: 'gitlab2', path: 'gitlab2')
projects.create!(id: 798, name: 'gitlab3', path: 'gitlab3')
# Create CI/CD pipelines # Create CI/CD pipelines
# #
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment