diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-06-06 20:54:23 +0200 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-06-06 20:54:23 +0200 |
| commit | 4ef636576aff3c4da91a1d72a6fa191297618286 (patch) | |
| tree | ddb92e212fa46a50c0d934f22c55c11f407066a2 | |
| parent | 602724fcfc9c482d248e512a07fdf0fda6dd0613 (diff) | |
| parent | da8bd81fe7c1042c50d7c693fdf37ea5b7b78285 (diff) | |
| download | gitlab-ce-4ef636576aff3c4da91a1d72a6fa191297618286.tar.gz | |
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
| -rw-r--r-- | db/migrate/20170526185602_add_stage_id_to_ci_builds.rb | 2 | ||||
| -rw-r--r-- | spec/migrations/migrate_build_stage_reference_spec.rb | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/db/migrate/20170526185602_add_stage_id_to_ci_builds.rb b/db/migrate/20170526185602_add_stage_id_to_ci_builds.rb index e8009e74ea5..d5675d5828b 100644 --- a/db/migrate/20170526185602_add_stage_id_to_ci_builds.rb +++ b/db/migrate/20170526185602_add_stage_id_to_ci_builds.rb @@ -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 diff --git a/spec/migrations/migrate_build_stage_reference_spec.rb b/spec/migrations/migrate_build_stage_reference_spec.rb index 32f9a0c0642..80b321860c2 100644 --- a/spec/migrations/migrate_build_stage_reference_spec.rb +++ b/spec/migrations/migrate_build_stage_reference_spec.rb @@ -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 # |