summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrpereira2 <rpereira@gitlab.com>2019-07-29 17:15:50 +0530
committerrpereira2 <rpereira@gitlab.com>2019-08-06 13:07:30 +0530
commit12a8f1925b5b0b2f36edef6d1fccaf4de5d50e51 (patch)
treec1568e5471c7cc9aa930d99a2874dd65512be9f1
parente79261017458f228b2d84dde0056d1108bfdc145 (diff)
downloadgitlab-ce-12a8f1925b5b0b2f36edef6d1fccaf4de5d50e51.tar.gz
Nullify instance_administration_project_id on del
- Otherwise deletion of the project will fail.
-rw-r--r--db/migrate/20190724112147_add_column_for_self_monitoring_project_id.rb2
-rw-r--r--db/schema.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/db/migrate/20190724112147_add_column_for_self_monitoring_project_id.rb b/db/migrate/20190724112147_add_column_for_self_monitoring_project_id.rb
index 96507b76a69..ce249a527e6 100644
--- a/db/migrate/20190724112147_add_column_for_self_monitoring_project_id.rb
+++ b/db/migrate/20190724112147_add_column_for_self_monitoring_project_id.rb
@@ -8,7 +8,7 @@ class AddColumnForSelfMonitoringProjectId < ActiveRecord::Migration[5.2]
:application_settings,
:instance_administration_project,
index: { name: 'index_applicationsettings_on_instance_administration_project_id' },
- foreign_key: { to_table: :projects }
+ foreign_key: { to_table: :projects, on_delete: :nullify }
)
end
end
diff --git a/db/schema.rb b/db/schema.rb
index 1ae73054121..f7d0e1a4813 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -3614,7 +3614,7 @@ ActiveRecord::Schema.define(version: 2019_08_02_012622) do
add_foreign_key "application_settings", "namespaces", column: "custom_project_templates_group_id", on_delete: :nullify
add_foreign_key "application_settings", "projects", column: "file_template_project_id", name: "fk_ec757bd087", on_delete: :nullify
- add_foreign_key "application_settings", "projects", column: "instance_administration_project_id"
+ add_foreign_key "application_settings", "projects", column: "instance_administration_project_id", on_delete: :nullify
add_foreign_key "application_settings", "users", column: "usage_stats_set_by_user_id", name: "fk_964370041d", on_delete: :nullify
add_foreign_key "approval_merge_request_rule_sources", "approval_merge_request_rules", on_delete: :cascade
add_foreign_key "approval_merge_request_rule_sources", "approval_project_rules", on_delete: :cascade