Add latest changes from gitlab-org/gitlab@master

9 files changed, 20 insertions, 10 deletions

diff --git a/db/docs/resource_iteration_events.yml b/db/docs/resource_iteration_events.yml
index 46a9e88fd9a..fe39c2cc04a 100644
--- a/db/docs/resource_iteration_events.yml
+++ b/db/docs/resource_iteration_events.yml
@@ -3,7 +3,7 @@ table_name: resource_iteration_events
 classes:
 - ResourceIterationEvent
 feature_categories:
-- planning_analytics
+- team_planning
 description: Records the addition and removal of issues to iterations
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/37617
 milestone: '13.3'
diff --git a/db/docs/resource_label_events.yml b/db/docs/resource_label_events.yml
index 9de636ea874..9997cb576aa 100644
--- a/db/docs/resource_label_events.yml
+++ b/db/docs/resource_label_events.yml
@@ -3,7 +3,7 @@ table_name: resource_label_events
 classes:
 - ResourceLabelEvent
 feature_categories:
-- planning_analytics
+- team_planning
 description: Records the addition and removal of labels from resources that can be labelled; such as issues, MRs and epics
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/6697
 milestone: '11.2'
diff --git a/db/docs/resource_link_events.yml b/db/docs/resource_link_events.yml
index cfa04aa522c..7d367a76c2c 100644
--- a/db/docs/resource_link_events.yml
+++ b/db/docs/resource_link_events.yml
@@ -3,7 +3,7 @@ table_name: resource_link_events
 classes:
 - WorkItems::ResourceLinkEvent
 feature_categories:
-- planning_analytics
+- team_planning
 description: Records the change of parent link on work items along with timestamps
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/114394
 milestone: '15.11'
diff --git a/db/docs/resource_milestone_events.yml b/db/docs/resource_milestone_events.yml
index 02962bc0056..5ec3271492f 100644
--- a/db/docs/resource_milestone_events.yml
+++ b/db/docs/resource_milestone_events.yml
@@ -3,7 +3,7 @@ table_name: resource_milestone_events
 classes:
 - ResourceMilestoneEvent
 feature_categories:
-- planning_analytics
+- team_planning
 description: Records the addition and removal of issues to milestones
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/23965
 milestone: '12.8'
diff --git a/db/docs/resource_state_events.yml b/db/docs/resource_state_events.yml
index 2390cd26bac..b93c7e51dd0 100644
--- a/db/docs/resource_state_events.yml
+++ b/db/docs/resource_state_events.yml
@@ -3,7 +3,7 @@ table_name: resource_state_events
 classes:
 - ResourceStateEvent
 feature_categories:
-- planning_analytics
+- team_planning
 description: Records the change of state of issues between opened and closed
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/28926
 milestone: '13.0'
diff --git a/db/docs/resource_weight_events.yml b/db/docs/resource_weight_events.yml
index 12cf9b27d19..2abd3be48f8 100644
--- a/db/docs/resource_weight_events.yml
+++ b/db/docs/resource_weight_events.yml
@@ -3,7 +3,7 @@ table_name: resource_weight_events
 classes:
 - ResourceWeightEvent
 feature_categories:
-- planning_analytics
+- team_planning
 description: Records the change of weight on issues along with timestamps
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/21515
 milestone: '12.7'
diff --git a/db/migrate/20230412185920_validate_ci_job_artifacts_file_final_path.rb b/db/migrate/20230412185920_validate_ci_job_artifacts_file_final_path.rb
new file mode 100644
index 00000000000..464ac1eec72
--- /dev/null
+++ b/db/migrate/20230412185920_validate_ci_job_artifacts_file_final_path.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class ValidateCiJobArtifactsFileFinalPath < Gitlab::Database::Migration[2.1]
+  def up
+    constraint_name = text_limit_name(:ci_job_artifacts, :file_final_path)
+    validate_check_constraint :ci_job_artifacts, constraint_name
+  end
+
+  # No-op
+  def down; end
+end
diff --git a/db/schema_migrations/20230412185920 b/db/schema_migrations/20230412185920
new file mode 100644
index 00000000000..4609cd6d2bf
--- /dev/null
+++ b/db/schema_migrations/20230412185920
@@ -0,0 +1 @@
+772e42722b07397934795164c2587e44ed4c0552d5c07eb8d867e66ee6795c65
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index a84efd98fb4..79bc3c1c793 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -13343,7 +13343,8 @@ CREATE TABLE ci_job_artifacts (
     partition_id bigint DEFAULT 100 NOT NULL,
     accessibility smallint DEFAULT 0 NOT NULL,
     file_final_path text,
-    CONSTRAINT check_27f0f6dbab CHECK ((file_store IS NOT NULL))
+    CONSTRAINT check_27f0f6dbab CHECK ((file_store IS NOT NULL)),
+    CONSTRAINT check_9f04410cf4 CHECK ((char_length(file_final_path) <= 1024))
 );
 
 CREATE SEQUENCE ci_job_artifacts_id_seq
@@ -26635,9 +26636,6 @@ ALTER TABLE ONLY chat_teams
 ALTER TABLE vulnerability_scanners
     ADD CONSTRAINT check_37608c9db5 CHECK ((char_length(vendor) <= 255)) NOT VALID;
 
-ALTER TABLE ci_job_artifacts
-    ADD CONSTRAINT check_9f04410cf4 CHECK ((char_length(file_final_path) <= 1024)) NOT VALID;
-
 ALTER TABLE sprints
     ADD CONSTRAINT check_ccd8a1eae0 CHECK ((start_date IS NOT NULL)) NOT VALID;