Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42

1 files changed, 19 insertions, 0 deletions

diff --git a/db/migrate/20210517144856_require_snapshot_namespace.rb b/db/migrate/20210517144856_require_snapshot_namespace.rb
new file mode 100644
index 00000000000..ec25c13383f
--- /dev/null
+++ b/db/migrate/20210517144856_require_snapshot_namespace.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require Rails.root.join('db', 'post_migrate', '20210430134202_copy_adoption_snapshot_namespace.rb')
+
+class RequireSnapshotNamespace < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    CopyAdoptionSnapshotNamespace.new.up
+
+    add_not_null_constraint(:analytics_devops_adoption_snapshots, :namespace_id)
+  end
+
+  def down
+    remove_not_null_constraint(:analytics_devops_adoption_snapshots, :namespace_id)
+  end
+end