Add latest changes from gitlab-org/gitlab@master

2 files changed, 30 insertions, 1 deletions

diff --git a/db/migrate/20191203121729_update_group_deletion_schedules_foreign_keys.rb b/db/migrate/20191203121729_update_group_deletion_schedules_foreign_keys.rb
new file mode 100644
index 00000000000..99531a1e93e
--- /dev/null
+++ b/db/migrate/20191203121729_update_group_deletion_schedules_foreign_keys.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+class UpdateGroupDeletionSchedulesForeignKeys < ActiveRecord::Migration[5.2]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_foreign_key(:group_deletion_schedules, :users, column: :user_id, on_delete: :cascade, name: new_foreign_key_name)
+    remove_foreign_key_if_exists(:group_deletion_schedules, column: :user_id, on_delete: :nullify)
+  end
+
+  def down
+    add_concurrent_foreign_key(:group_deletion_schedules, :users, column: :user_id, on_delete: :nullify, name: existing_foreign_key_name)
+    remove_foreign_key_if_exists(:group_deletion_schedules, column: :user_id, on_delete: :cascade)
+  end
+
+  private
+
+  def new_foreign_key_name
+    concurrent_foreign_key_name(:group_deletion_schedules, :user_id)
+  end
+
+  def existing_foreign_key_name
+    'fk_group_deletion_schedules_users_user_id'
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 42420e653aa..da0cfd80ac2 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -4490,7 +4490,7 @@ ActiveRecord::Schema.define(version: 2019_12_06_122926) do
   add_foreign_key "grafana_integrations", "projects", on_delete: :cascade
   add_foreign_key "group_custom_attributes", "namespaces", column: "group_id", on_delete: :cascade
   add_foreign_key "group_deletion_schedules", "namespaces", column: "group_id", on_delete: :cascade
-  add_foreign_key "group_deletion_schedules", "users", on_delete: :nullify
+  add_foreign_key "group_deletion_schedules", "users", name: "fk_11e3ebfcdd", on_delete: :cascade
   add_foreign_key "group_group_links", "namespaces", column: "shared_group_id", on_delete: :cascade
   add_foreign_key "group_group_links", "namespaces", column: "shared_with_group_id", on_delete: :cascade
   add_foreign_key "identities", "saml_providers", name: "fk_aade90f0fc", on_delete: :cascade