Add latest changes from gitlab-org/gitlab@master

3 files changed, 13 insertions, 1 deletions

diff --git a/db/migrate/20210224132547_add_null_constraint_to_terraform_state_name.rb b/db/migrate/20210224132547_add_null_constraint_to_terraform_state_name.rb
new file mode 100644
index 00000000000..d9f23311cf5
--- /dev/null
+++ b/db/migrate/20210224132547_add_null_constraint_to_terraform_state_name.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class AddNullConstraintToTerraformStateName < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  def change
+    change_column_null :terraform_states, :name, false
+  end
+end
diff --git a/db/schema_migrations/20210224132547 b/db/schema_migrations/20210224132547
new file mode 100644
index 00000000000..f38b394f082
--- /dev/null
+++ b/db/schema_migrations/20210224132547
@@ -0,0 +1 @@
+ac0f71b427be1fb583474e352ce9468a1270c6e67fa40f9071751a0485f21160
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 6c463a668d2..b829666c1d3 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -17599,7 +17599,7 @@ CREATE TABLE terraform_states (
     locked_at timestamp with time zone,
     locked_by_user_id bigint,
     uuid character varying(32) NOT NULL,
-    name character varying(255),
+    name character varying(255) NOT NULL,
     versioning_enabled boolean DEFAULT true NOT NULL
 );