Add latest changes from gitlab-org/gitlab@master

7 files changed, 42 insertions, 2 deletions

diff --git a/db/migrate/20211108204736_add_policy_idx_to_approval_project_rule.rb b/db/migrate/20211108204736_add_policy_idx_to_approval_project_rule.rb
new file mode 100644
index 00000000000..90e5fa34817
--- /dev/null
+++ b/db/migrate/20211108204736_add_policy_idx_to_approval_project_rule.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddPolicyIdxToApprovalProjectRule < Gitlab::Database::Migration[1.0]
+  enable_lock_retries!
+
+  def change
+    add_column :approval_project_rules, :orchestration_policy_idx, :integer, limit: 2
+  end
+end
diff --git a/db/migrate/20211122215001_add_policy_idx_to_approval_merge_request_rule.rb b/db/migrate/20211122215001_add_policy_idx_to_approval_merge_request_rule.rb
new file mode 100644
index 00000000000..b1c7bc4d5ce
--- /dev/null
+++ b/db/migrate/20211122215001_add_policy_idx_to_approval_merge_request_rule.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddPolicyIdxToApprovalMergeRequestRule < Gitlab::Database::Migration[1.0]
+  enable_lock_retries!
+
+  def change
+    add_column :approval_merge_request_rules, :orchestration_policy_idx, :integer, limit: 2
+  end
+end
diff --git a/db/post_migrate/20211116091751_change_namespace_type_default_to_user.rb b/db/post_migrate/20211116091751_change_namespace_type_default_to_user.rb
new file mode 100644
index 00000000000..468b26e9eb1
--- /dev/null
+++ b/db/post_migrate/20211116091751_change_namespace_type_default_to_user.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class ChangeNamespaceTypeDefaultToUser < Gitlab::Database::Migration[1.0]
+  disable_ddl_transaction!
+
+  def up
+    with_lock_retries do
+      change_column_default :namespaces, :type, 'User'
+    end
+  end
+
+  def down
+    with_lock_retries do
+      change_column_default :namespaces, :type, nil
+    end
+  end
+end
diff --git a/db/schema_migrations/20211108204736 b/db/schema_migrations/20211108204736
new file mode 100644
index 00000000000..6d37b1b1184
--- /dev/null
+++ b/db/schema_migrations/20211108204736
@@ -0,0 +1 @@
+9e01b1817e4c578f5be7d7378dc12a8535c2bbbff5ecbc77f5a7cfdb148927f5
\ No newline at end of file
diff --git a/db/schema_migrations/20211116091751 b/db/schema_migrations/20211116091751
new file mode 100644
index 00000000000..8b13b53e437
--- /dev/null
+++ b/db/schema_migrations/20211116091751
@@ -0,0 +1 @@
+d71889bba2150265e9482be0b5ee89f43168d4a35b47469a36873d65f00df878
\ No newline at end of file
diff --git a/db/schema_migrations/20211122215001 b/db/schema_migrations/20211122215001
new file mode 100644
index 00000000000..be0fd652eb7
--- /dev/null
+++ b/db/schema_migrations/20211122215001
@@ -0,0 +1 @@
+fc29e10717357f7dd57940042d69a6c43a0d17fdf3c951917a76eae8c1d93ba3
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 9a57719ec24..1c537790fd7 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -10547,6 +10547,7 @@ CREATE TABLE approval_merge_request_rules (
     report_type smallint,
     section text,
     modified_from_project_rule boolean DEFAULT false NOT NULL,
+    orchestration_policy_idx smallint,
     CONSTRAINT check_6fca5928b2 CHECK ((char_length(section) <= 255))
 );
 
@@ -10616,7 +10617,8 @@ CREATE TABLE approval_project_rules (
     vulnerabilities_allowed smallint DEFAULT 0 NOT NULL,
     severity_levels text[] DEFAULT '{}'::text[] NOT NULL,
     report_type smallint,
-    vulnerability_states text[] DEFAULT '{newly_detected}'::text[] NOT NULL
+    vulnerability_states text[] DEFAULT '{newly_detected}'::text[] NOT NULL,
+    orchestration_policy_idx smallint
 );
 
 CREATE TABLE approval_project_rules_groups (
@@ -16353,7 +16355,7 @@ CREATE TABLE namespaces (
     owner_id integer,
     created_at timestamp without time zone,
     updated_at timestamp without time zone,
-    type character varying,
+    type character varying DEFAULT 'User'::character varying,
     description character varying DEFAULT ''::character varying NOT NULL,
     avatar character varying,
     membership_lock boolean DEFAULT false,