Add latest changes from gitlab-org/gitlab@master

1 files changed, 17 insertions, 0 deletions

diff --git a/db/migrate/20191128145232_add_fk_to_ci_resources_build_id.rb b/db/migrate/20191128145232_add_fk_to_ci_resources_build_id.rb
new file mode 100644
index 00000000000..a13513de3b2
--- /dev/null
+++ b/db/migrate/20191128145232_add_fk_to_ci_resources_build_id.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class AddFkToCiResourcesBuildId < ActiveRecord::Migration[5.2]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_foreign_key :ci_resources, :ci_builds, column: :build_id, on_delete: :nullify
+  end
+
+  def down
+    remove_foreign_key_if_exists :ci_resources, column: :build_id
+  end
+end