Add latest changes from gitlab-org/gitlab@master

3 files changed, 0 insertions, 35 deletions

diff --git a/db/migrate/20191029060358_add_mark_for_deletion_to_namespaces.rb b/db/migrate/20191029060358_add_mark_for_deletion_to_namespaces.rb
deleted file mode 100644
index b66e3b7e62a..00000000000
--- a/db/migrate/20191029060358_add_mark_for_deletion_to_namespaces.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-class AddMarkForDeletionToNamespaces < ActiveRecord::Migration[5.2]
-  DOWNTIME = false
-
-  def change
-    add_column :namespaces, :marked_for_deletion_at, :date
-    add_column :namespaces, :marked_for_deletion_by_user_id, :integer
-  end
-end
diff --git a/db/migrate/20191029061556_add_mark_for_deletion_indices_to_namespaces.rb b/db/migrate/20191029061556_add_mark_for_deletion_indices_to_namespaces.rb
deleted file mode 100644
index ce01791bc2e..00000000000
--- a/db/migrate/20191029061556_add_mark_for_deletion_indices_to_namespaces.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-class AddMarkForDeletionIndicesToNamespaces < ActiveRecord::Migration[5.2]
-  include Gitlab::Database::MigrationHelpers
-
-  DOWNTIME = false
-  disable_ddl_transaction!
-
-  def up
-    add_concurrent_foreign_key :namespaces, :users, column: :marked_for_deletion_by_user_id, on_delete: :nullify
-    add_concurrent_index :namespaces, :marked_for_deletion_by_user_id, where: 'marked_for_deletion_by_user_id IS NOT NULL'
-    add_concurrent_index :namespaces, :marked_for_deletion_at, where: 'marked_for_deletion_at IS NOT NULL'
-  end
-
-  def down
-    remove_foreign_key_if_exists :namespaces, column: :marked_for_deletion_by_user_id
-    remove_concurrent_index :namespaces, :marked_for_deletion_by_user_id
-    remove_concurrent_index :namespaces, :marked_for_deletion_at
-  end
-end
diff --git a/db/schema.rb b/db/schema.rb
index 368a1b91e06..c0b74841834 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -2492,15 +2492,11 @@ ActiveRecord::Schema.define(version: 2019_11_05_094625) do
     t.boolean "emails_disabled"
     t.integer "max_pages_size"
     t.integer "max_artifacts_size"
-    t.date "marked_for_deletion_at"
-    t.integer "marked_for_deletion_by_user_id"
     t.index ["created_at"], name: "index_namespaces_on_created_at"
     t.index ["custom_project_templates_group_id", "type"], name: "index_namespaces_on_custom_project_templates_group_id_and_type", where: "(custom_project_templates_group_id IS NOT NULL)"
     t.index ["file_template_project_id"], name: "index_namespaces_on_file_template_project_id"
     t.index ["ldap_sync_last_successful_update_at"], name: "index_namespaces_on_ldap_sync_last_successful_update_at"
     t.index ["ldap_sync_last_update_at"], name: "index_namespaces_on_ldap_sync_last_update_at"
-    t.index ["marked_for_deletion_at"], name: "index_namespaces_on_marked_for_deletion_at", where: "(marked_for_deletion_at IS NOT NULL)"
-    t.index ["marked_for_deletion_by_user_id"], name: "index_namespaces_on_marked_for_deletion_by_user_id", where: "(marked_for_deletion_by_user_id IS NOT NULL)"
     t.index ["name", "parent_id"], name: "index_namespaces_on_name_and_parent_id", unique: true
     t.index ["name"], name: "index_namespaces_on_name_trigram", opclass: :gin_trgm_ops, using: :gin
     t.index ["owner_id"], name: "index_namespaces_on_owner_id"
@@ -4367,7 +4363,6 @@ ActiveRecord::Schema.define(version: 2019_11_05_094625) do
   add_foreign_key "namespaces", "namespaces", column: "custom_project_templates_group_id", name: "fk_e7a0b20a6b", on_delete: :nullify
   add_foreign_key "namespaces", "plans", name: "fk_fdd12e5b80", on_delete: :nullify
   add_foreign_key "namespaces", "projects", column: "file_template_project_id", name: "fk_319256d87a", on_delete: :nullify
-  add_foreign_key "namespaces", "users", column: "marked_for_deletion_by_user_id", name: "fk_9ff61b4c22", on_delete: :nullify
   add_foreign_key "note_diff_files", "notes", column: "diff_note_id", on_delete: :cascade
   add_foreign_key "notes", "projects", name: "fk_99e097b079", on_delete: :cascade
   add_foreign_key "notes", "reviews", name: "fk_2e82291620", on_delete: :nullify