Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42

1 files changed, 21 insertions, 0 deletions

diff --git a/db/post_migrate/20201005153955_add_not_null_constraint_to_compliance_project_settings.rb b/db/post_migrate/20201005153955_add_not_null_constraint_to_compliance_project_settings.rb
new file mode 100644
index 00000000000..6d47cbe9f08
--- /dev/null
+++ b/db/post_migrate/20201005153955_add_not_null_constraint_to_compliance_project_settings.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class AddNotNullConstraintToComplianceProjectSettings < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    add_not_null_constraint(:project_compliance_framework_settings, :framework_id)
+
+    change_column_null(:compliance_management_frameworks, :namespace_id, false)
+  end
+
+  def down
+    change_column_null(:compliance_management_frameworks, :namespace_id, true)
+
+    remove_not_null_constraint(:project_compliance_framework_settings, :framework_id)
+  end
+end