Add latest changes from gitlab-org/gitlab@master

7 files changed, 19 insertions, 26 deletions

diff --git a/config/feature_flags/development/apollo_boards.yml b/config/feature_flags/development/apollo_boards.yml
deleted file mode 100644
index 09b37f4d2ed..00000000000
--- a/config/feature_flags/development/apollo_boards.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: apollo_boards
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102719
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/381210
-milestone: '15.6'
-type: development
-group: group::product planning
-default_enabled: true
diff --git a/config/feature_flags/development/cache_control_headers_for_openid_jwks.yml b/config/feature_flags/development/cache_control_headers_for_openid_jwks.yml
deleted file mode 100644
index 79f7a27eeac..00000000000
--- a/config/feature_flags/development/cache_control_headers_for_openid_jwks.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: cache_control_headers_for_openid_jwks
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138405
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/433360
-milestone: '16.7'
-type: development
-group: group::pipeline security
-default_enabled: false
\ No newline at end of file
diff --git a/config/feature_flags/development/invalid_graphql_auth_401.yml b/config/feature_flags/development/invalid_graphql_auth_401.yml
deleted file mode 100644
index 668a86cc52f..00000000000
--- a/config/feature_flags/development/invalid_graphql_auth_401.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: invalid_graphql_auth_401
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132149
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/426196
-milestone: '16.5'
-type: development
-group: group::import and integrate
-default_enabled: false
diff --git a/config/feature_flags/development/markdown_rust.yml b/config/feature_flags/development/markdown_rust.yml
new file mode 100644
index 00000000000..2a982525e45
--- /dev/null
+++ b/config/feature_flags/development/markdown_rust.yml
@@ -0,0 +1,8 @@
+---
+name: markdown_rust
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/139825
+rollout_issue_url:
+milestone: '16.8'
+type: development
+group: group::project management
+default_enabled: false
diff --git a/config/feature_flags/development/sast_reports_in_inline_diff.yml b/config/feature_flags/development/sast_reports_in_inline_diff.yml
index 2e320e8e602..78729ed1466 100644
--- a/config/feature_flags/development/sast_reports_in_inline_diff.yml
+++ b/config/feature_flags/development/sast_reports_in_inline_diff.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/410191
 milestone: '16.0'
 type: development
 group: group::static analysis
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/self_managed_code_suggestions.yml b/config/feature_flags/development/self_managed_code_suggestions.yml
index 1c0f636bd8b..ccde3fbc75f 100644
--- a/config/feature_flags/development/self_managed_code_suggestions.yml
+++ b/config/feature_flags/development/self_managed_code_suggestions.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/432983
 milestone: '16.7'
 type: development
 group: group::purchase
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/wip/vulnerability_owasp_top_10_group.yml b/config/feature_flags/wip/vulnerability_owasp_top_10_group.yml
new file mode 100644
index 00000000000..75234433e44
--- /dev/null
+++ b/config/feature_flags/wip/vulnerability_owasp_top_10_group.yml
@@ -0,0 +1,9 @@
+---
+name: vulnerability_owasp_top_10_group
+feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/432618
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/140205
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/437253
+milestone: '16.8'
+group: group::threat insights
+type: wip
+default_enabled: false