Commit 253b61d2 authored by Stan Hu's avatar Stan Hu

Merge branch 'fix-migration-rc1-rollback' into 'master'

Fixing two migrations that could not be rolled back

See merge request !9953
parents 8fddde5b fbbaff4a
...@@ -3,6 +3,6 @@ class DropIndexForBuildsProjectStatus < ActiveRecord::Migration ...@@ -3,6 +3,6 @@ class DropIndexForBuildsProjectStatus < ActiveRecord::Migration
DOWNTIME = false DOWNTIME = false
def change def change
remove_index(:ci_commits, [:gl_project_id, :status]) remove_index(:ci_commits, column: [:gl_project_id, :status])
end end
end end
...@@ -5,7 +5,11 @@ class AddOwnerIdForeignKey < ActiveRecord::Migration ...@@ -5,7 +5,11 @@ class AddOwnerIdForeignKey < ActiveRecord::Migration
disable_ddl_transaction! disable_ddl_transaction!
def change def up
add_concurrent_foreign_key :ci_triggers, :users, column: :owner_id, on_delete: :cascade add_concurrent_foreign_key :ci_triggers, :users, column: :owner_id, on_delete: :cascade
end end
def down
remove_foreign_key :ci_triggers, column: :owner_id
end
end end
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