Add latest changes from gitlab-org/gitlab@16-5-stable-eev16.5.0-rc42

11 files changed, 121 insertions, 130 deletions

diff --git a/spec/fixtures/api/schemas/entities/note_user_entity.json b/spec/fixtures/api/schemas/entities/note_user_entity.json
index f5d28dd7b71..16d33ada51d 100644
--- a/spec/fixtures/api/schemas/entities/note_user_entity.json
+++ b/spec/fixtures/api/schemas/entities/note_user_entity.json
@@ -3,19 +3,42 @@
   "required": [
     "id",
     "state",
+    "locked",
     "avatar_url",
     "path",
     "name",
     "username"
   ],
   "properties": {
-    "id": { "type": "integer" },
-    "state": { "type": "string" },
-    "avatar_url": { "type": [ "string", "null" ] },
-    "path": { "type": "string" },
-    "name": { "type": "string" },
-    "username": { "type": "string" },
-    "status_tooltip_html": { "$ref": "../types/nullable_string.json" },
-    "show_status": { "type": "boolean" }
+    "id": {
+      "type": "integer"
+    },
+    "state": {
+      "type": "string"
+    },
+    "locked": {
+      "type": "boolean"
+    },
+    "avatar_url": {
+      "type": [
+        "string",
+        "null"
+      ]
+    },
+    "path": {
+      "type": "string"
+    },
+    "name": {
+      "type": "string"
+    },
+    "username": {
+      "type": "string"
+    },
+    "status_tooltip_html": {
+      "$ref": "../types/nullable_string.json"
+    },
+    "show_status": {
+      "type": "boolean"
+    }
   }
 }
diff --git a/spec/fixtures/api/schemas/entities/user.json b/spec/fixtures/api/schemas/entities/user.json
index 984b7184d36..ca2ad201d66 100644
--- a/spec/fixtures/api/schemas/entities/user.json
+++ b/spec/fixtures/api/schemas/entities/user.json
@@ -3,6 +3,7 @@
   "required": [
     "id",
     "state",
+    "locked",
     "avatar_url",
     "web_url",
     "path",
@@ -10,13 +11,35 @@
     "username"
   ],
   "properties": {
-    "id": { "type": "integer" },
-    "state": { "type": "string" },
-    "avatar_url": { "type": [ "string", "null" ] },
-    "web_url": { "type": "string" },
-    "path": { "type": "string" },
-    "name": { "type": "string" },
-    "username": { "type": "string" },
-    "status_tooltip_html": { "$ref": "../types/nullable_string.json" }
+    "id": {
+      "type": "integer"
+    },
+    "state": {
+      "type": "string"
+    },
+    "locked": {
+      "type": "boolean"
+    },
+    "avatar_url": {
+      "type": [
+        "string",
+        "null"
+      ]
+    },
+    "web_url": {
+      "type": "string"
+    },
+    "path": {
+      "type": "string"
+    },
+    "name": {
+      "type": "string"
+    },
+    "username": {
+      "type": "string"
+    },
+    "status_tooltip_html": {
+      "$ref": "../types/nullable_string.json"
+    }
   }
 }
diff --git a/spec/fixtures/api/schemas/graphql/packages/package_details.json b/spec/fixtures/api/schemas/graphql/packages/package_details.json
index f66f5eb35b5..2e7a950d330 100644
--- a/spec/fixtures/api/schemas/graphql/packages/package_details.json
+++ b/spec/fixtures/api/schemas/graphql/packages/package_details.json
@@ -14,6 +14,7 @@
     "pipelines",
     "versions",
     "status",
+    "statusMessage",
     "canDestroy",
     "lastDownloadedAt",
     "_links"
@@ -171,6 +172,12 @@
         "ERROR"
       ]
     },
+    "statusMessage": {
+      "type": [
+        "string",
+        "null"
+      ]
+    },
     "dependencyLinks": {
       "type": "object",
       "additionalProperties": false,
diff --git a/spec/fixtures/api/schemas/jira_connect/pull_request.json b/spec/fixtures/api/schemas/jira_connect/pull_request.json
index 430752335be..a24af318d30 100644
--- a/spec/fixtures/api/schemas/jira_connect/pull_request.json
+++ b/spec/fixtures/api/schemas/jira_connect/pull_request.json
@@ -16,6 +16,12 @@
     "author": {
       "$ref": "./author.json"
     },
+    "reviewers": {
+      "type": "array",
+      "items": {
+        "$ref": "./reviewer.json"
+      }
+    },
     "commentCount": {
       "type": "integer"
     },
@@ -60,4 +66,4 @@
     "updateSequenceId"
   ],
   "additionalProperties": false
-}
\ No newline at end of file
+}
diff --git a/spec/fixtures/api/schemas/jira_connect/reviewer.json b/spec/fixtures/api/schemas/jira_connect/reviewer.json
new file mode 100644
index 00000000000..a51af87e4ca
--- /dev/null
+++ b/spec/fixtures/api/schemas/jira_connect/reviewer.json
@@ -0,0 +1,20 @@
+{
+  "type": "object",
+  "properties": {
+    "name": {
+      "type": "string"
+    },
+    "email": {
+      "type": "string"
+    },
+    "approvalStatus": {
+      "type": "string"
+    }
+  },
+  "required": [
+    "name",
+    "email",
+    "approvalStatus"
+  ],
+  "additionalProperties": false
+}
diff --git a/spec/fixtures/api/schemas/public_api/v4/issue.json b/spec/fixtures/api/schemas/public_api/v4/issue.json
index c2b096a922f..dbec110bccf 100644
--- a/spec/fixtures/api/schemas/public_api/v4/issue.json
+++ b/spec/fixtures/api/schemas/public_api/v4/issue.json
@@ -150,6 +150,9 @@
           "state": {
             "type": "string"
           },
+          "locked": {
+            "type": "boolean"
+          },
           "avatar_url": {
             "type": "string",
             "format": "uri"
@@ -180,6 +183,9 @@
         "state": {
           "type": "string"
         },
+        "locked": {
+          "type": "boolean"
+        },
         "avatar_url": {
           "type": "string",
           "format": "uri"
@@ -206,6 +212,9 @@
         "state": {
           "type": "string"
         },
+        "locked": {
+          "type": "boolean"
+        },
         "avatar_url": {
           "type": "string",
           "format": "uri"
@@ -218,6 +227,7 @@
       "required": [
         "id",
         "state",
+        "locked",
         "avatar_url",
         "name",
         "username",
@@ -308,4 +318,4 @@
     "confidential",
     "web_url"
   ]
-}
\ No newline at end of file
+}
diff --git a/spec/fixtures/lib/generators/gitlab/usage_metric_definition_generator/sample_metric.yml b/spec/fixtures/lib/generators/gitlab/usage_metric_definition_generator/sample_metric.yml
index 29dd2ce0e84..64cf9371858 100644
--- a/spec/fixtures/lib/generators/gitlab/usage_metric_definition_generator/sample_metric.yml
+++ b/spec/fixtures/lib/generators/gitlab/usage_metric_definition_generator/sample_metric.yml
@@ -1,5 +1,5 @@
 ---
-# See Usage Ping metrics dictionary docs https://docs.gitlab.com/ee/development/usage_ping/metrics_dictionary.html
+# See Usage Ping metrics dictionary docs https://docs.gitlab.com/ee/development/internal_analytics/metrics/metrics_dictionary.html
 key_path: counts_weekly.test_metric
 description:
 product_section:
diff --git a/spec/fixtures/markdown.md.erb b/spec/fixtures/markdown.md.erb
index 37376713355..8e11f95be8b 100644
--- a/spec/fixtures/markdown.md.erb
+++ b/spec/fixtures/markdown.md.erb
@@ -203,7 +203,7 @@ Note: work item references use `#`, which get built as an issue link.
 - Ignored in code: `<%= work_item.to_reference %>`
 - Ignored in links: [Link to <%= work_item.to_reference %>](#work_item-link)
 - Ignored when backslash escaped: \<%= work_item.to_reference %>
-- Work item by URL: <%= urls.project_work_item_url(work_item.project, work_item) %>
+- Work item by URL: <%= urls.project_work_item_url(work_item.project, work_item.iid) %>
 - Link to work item by reference (counted as an issue reference): [Work item](<%= work_item.to_reference %>)
 - Link to work item by URL: [Work item](<%= urls.project_work_item_url(work_item.project, work_item) %>)
 
diff --git a/spec/fixtures/packages/nuget/package_with_symbols.snupkg b/spec/fixtures/packages/nuget/package_with_symbols.snupkg
new file mode 100644
index 00000000000..b4ff4ba7f9f
--- /dev/null
+++ b/spec/fixtures/packages/nuget/package_with_symbols.snupkg
diff --git a/spec/fixtures/security_reports/master/gl-common-scanning-report.json b/spec/fixtures/security_reports/master/gl-common-scanning-report.json
index 31a86d3a8ae..47e2a503b02 100644
--- a/spec/fixtures/security_reports/master/gl-common-scanning-report.json
+++ b/spec/fixtures/security_reports/master/gl-common-scanning-report.json
@@ -12,6 +12,12 @@
         "id": "gemnasium",
         "name": "Gemnasium"
       },
+      "cvss": [
+        {
+          "vendor": "GitLab",
+          "vector_string": "CVSS:3.1/AV:N/AC:L/PR:N/UI:R/S:U/C:H/I:H/A:H"
+        }
+      ],
       "location": {
         "file": "some/kind/of/file.c",
         "dependency": {
@@ -414,7 +420,9 @@
           "value": "foo"
         }
       ],
-      "links": []
+      "links": [
+
+      ]
     }
   ],
   "remediations": [
@@ -476,7 +484,9 @@
       "diff": "dG90YWxseSBsZWdpdGltYXRlIGRpZmYsIDEwLzEwIHdvdWxkIGFwcGx5"
     }
   ],
-  "dependency_files": [],
+  "dependency_files": [
+
+  ],
   "scan": {
     "analyzer": {
       "id": "common-analyzer",
diff --git a/spec/fixtures/structure.sql b/spec/fixtures/structure.sql
deleted file mode 100644
index 421fb6c3593..00000000000
--- a/spec/fixtures/structure.sql
+++ /dev/null
@@ -1,108 +0,0 @@
-CREATE INDEX missing_index ON events USING btree (created_at, author_id);
-
-CREATE UNIQUE INDEX wrong_index ON table_name (column_name, column_name_2);
-
-CREATE UNIQUE INDEX "index" ON achievements USING btree (namespace_id, lower(name));
-
-CREATE INDEX index_namespaces_public_groups_name_id ON namespaces USING btree (name, id) WHERE (((type)::text = 'Group'::text) AND (visibility_level = 20));
-
-CREATE UNIQUE INDEX index_on_deploy_keys_id_and_type_and_public ON keys USING btree (id, type) WHERE (public = true);
-
-CREATE INDEX index_users_on_public_email_excluding_null_and_empty ON users USING btree (public_email) WHERE (((public_email)::text <> ''::text) AND (public_email IS NOT NULL));
-
-CREATE TABLE test_table (
-  id bigint NOT NULL,
-  integer_column integer,
-  integer_with_default_column integer DEFAULT 1,
-  smallint_column smallint,
-  smallint_with_default_column smallint DEFAULT 0 NOT NULL,
-  numeric_column numeric NOT NULL,
-  numeric_with_default_column numeric DEFAULT 1.0 NOT NULL,
-  boolean_colum boolean,
-  boolean_with_default_colum boolean DEFAULT true NOT NULL,
-  double_precision_column double precision,
-  double_precision_with_default_column double precision DEFAULT 1.0,
-  varying_column character varying,
-  varying_with_default_column character varying DEFAULT 'DEFAULT'::character varying NOT NULL,
-  varying_with_limit_column character varying(255),
-  varying_with_limit_and_default_column character varying(255) DEFAULT 'DEFAULT'::character varying,
-  text_column text NOT NULL,
-  text_with_default_column text DEFAULT ''::text NOT NULL,
-  array_column character varying(255)[] NOT NULL,
-  array_with_default_column character varying(255)[] DEFAULT '{one,two}'::character varying[] NOT NULL,
-  jsonb_column jsonb,
-  jsonb_with_default_column jsonb DEFAULT '[]'::jsonb NOT NULL,
-  timestamptz_column timestamp with time zone,
-  timestamptz_with_default_column timestamp(6) with time zone DEFAULT now(),
-  timestamp_column timestamp(6) without time zone NOT NULL,
-  timestamp_with_default_column timestamp(6) without time zone DEFAULT '2022-01-23 00:00:00+00'::timestamp without time zone NOT NULL,
-  date_column date,
-  date_with_default_column date DEFAULT '2023-04-05',
-  inet_column inet NOT NULL,
-  inet_with_default_column inet DEFAULT '0.0.0.0'::inet NOT NULL,
-  macaddr_column macaddr,
-  macaddr_with_default_column macaddr DEFAULT '00-00-00-00-00-000'::macaddr NOT NULL,
-  uuid_column uuid NOT NULL,
-  uuid_with_default_column uuid DEFAULT '00000000-0000-0000-0000-000000000000'::uuid NOT NULL,
-  bytea_column bytea,
-  bytea_with_default_column bytea DEFAULT '\xDEADBEEF'::bytea,
-  unmapped_column_type anyarray,
-  partition_key bigint DEFAULT 1 NOT NULL,
-  created_at timestamp with time zone DEFAULT now() NOT NULL
-) PARTITION BY HASH (partition_key, created_at);
-
-CREATE TABLE ci_project_mirrors (
-    id bigint NOT NULL,
-    project_id integer NOT NULL,
-    namespace_id integer NOT NULL
-);
-
-CREATE TABLE wrong_table (
-  id bigint NOT NULL,
-  description character varying(255) NOT NULL
-);
-
-CREATE TABLE extra_table_columns (
-  id bigint NOT NULL,
-  name character varying(255) NOT NULL
-);
-
-CREATE TABLE missing_table (
-  id bigint NOT NULL,
-  description text NOT NULL
-);
-
-CREATE TABLE missing_table_columns (
-  id bigint NOT NULL,
-  email character varying(255) NOT NULL
-);
-
-CREATE TABLE operations_user_lists (
-  id bigint NOT NULL,
-  project_id bigint NOT NULL,
-  created_at timestamp with time zone NOT NULL,
-  updated_at timestamp with time zone NOT NULL,
-  iid integer NOT NULL,
-  name character varying(255) NOT NULL,
-  user_xids text DEFAULT ''::text NOT NULL
-);
-
-CREATE TRIGGER trigger AFTER INSERT ON public.t1 FOR EACH ROW EXECUTE FUNCTION t1();
-
-CREATE TRIGGER wrong_trigger BEFORE UPDATE ON public.t2 FOR EACH ROW EXECUTE FUNCTION my_function();
-
-CREATE TRIGGER missing_trigger_1 BEFORE INSERT OR UPDATE ON public.t3 FOR EACH ROW EXECUTE FUNCTION t3();
-
-CREATE TRIGGER projects_loose_fk_trigger AFTER DELETE ON projects REFERENCING OLD TABLE AS old_table FOR EACH STATEMENT EXECUTE FUNCTION insert_into_loose_foreign_keys_deleted_records();
-
-ALTER TABLE web_hooks
-    ADD CONSTRAINT web_hooks_project_id_fkey FOREIGN KEY (project_id) REFERENCES projects(id) ON DELETE CASCADE;
-
-ALTER TABLE ONLY issues
-    ADD CONSTRAINT wrong_definition_fk FOREIGN KEY (author_id) REFERENCES users(id) ON DELETE SET NULL;
-
-ALTER TABLE ONLY issues
-    ADD CONSTRAINT missing_fk FOREIGN KEY (author_id) REFERENCES users(id) ON DELETE SET NULL;
-
-ALTER TABLE ONLY bulk_import_configurations
-    ADD CONSTRAINT fk_rails_536b96bff1 FOREIGN KEY (bulk_import_id) REFERENCES bulk_imports(id) ON DELETE CASCADE;