Add latest changes from gitlab-org/gitlab@master

11 files changed, 20 insertions, 41 deletions

diff --git a/config/feature_flags/development/ajax_new_deploy_token.yml b/config/feature_flags/development/ajax_new_deploy_token.yml
index cffd589b32b..336e3004d52 100644
--- a/config/feature_flags/development/ajax_new_deploy_token.yml
+++ b/config/feature_flags/development/ajax_new_deploy_token.yml
@@ -1,7 +1,7 @@
 ---
 name: ajax_new_deploy_token
-introduced_by_url: 
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/27141
 rollout_issue_url: 
-group: 
+group: group::progressive delivery
 type: development
 default_enabled: false
diff --git a/config/feature_flags/development/allow_group_deploy_token.yml b/config/feature_flags/development/allow_group_deploy_token.yml
index f08614b45e9..06a8659292d 100644
--- a/config/feature_flags/development/allow_group_deploy_token.yml
+++ b/config/feature_flags/development/allow_group_deploy_token.yml
@@ -1,7 +1,7 @@
 ---
 name: allow_group_deploy_token
-introduced_by_url: 
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/23460
 rollout_issue_url: 
-group: 
+group: group::progressive delivery
 type: development
 default_enabled: true
diff --git a/config/feature_flags/development/ci_bulk_insert_on_create.yml b/config/feature_flags/development/ci_bulk_insert_on_create.yml
deleted file mode 100644
index 3227497ecfc..00000000000
--- a/config/feature_flags/development/ci_bulk_insert_on_create.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-name: ci_bulk_insert_on_create
-introduced_by_url: 
-rollout_issue_url: 
-group: 
-type: development
-default_enabled: true
diff --git a/config/feature_flags/development/ci_update_queues_for_online_runners.yml b/config/feature_flags/development/ci_update_queues_for_online_runners.yml
deleted file mode 100644
index f2bce6e14b5..00000000000
--- a/config/feature_flags/development/ci_update_queues_for_online_runners.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-name: ci_update_queues_for_online_runners
-introduced_by_url: 
-rollout_issue_url: 
-group: 
-type: development
-default_enabled: true
diff --git a/config/feature_flags/development/code_navigation.yml b/config/feature_flags/development/code_navigation.yml
deleted file mode 100644
index 1e62abfbaaa..00000000000
--- a/config/feature_flags/development/code_navigation.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-name: code_navigation
-introduced_by_url: 
-rollout_issue_url: 
-group: 
-type: development
-default_enabled: true
diff --git a/config/feature_flags/development/forward_deployment_enabled.yml b/config/feature_flags/development/forward_deployment_enabled.yml
index 51cc99e39ae..f9aed1a0568 100644
--- a/config/feature_flags/development/forward_deployment_enabled.yml
+++ b/config/feature_flags/development/forward_deployment_enabled.yml
@@ -1,7 +1,7 @@
 ---
 name: forward_deployment_enabled
-introduced_by_url: 
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/24412
 rollout_issue_url: 
-group: 
+group: group::progressive delivery
 type: development
 default_enabled: true
diff --git a/config/feature_flags/development/ingress_modsecurity.yml b/config/feature_flags/development/ingress_modsecurity.yml
index cf289bb3d45..a8c8c3b26da 100644
--- a/config/feature_flags/development/ingress_modsecurity.yml
+++ b/config/feature_flags/development/ingress_modsecurity.yml
@@ -1,7 +1,7 @@
 ---
 name: ingress_modsecurity
-introduced_by_url: 
-rollout_issue_url: 
-group: 
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/20194
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/258554
+group: "group::container security"
 type: development
 default_enabled: false
diff --git a/config/feature_flags/development/project_export_as_ndjson.yml b/config/feature_flags/development/project_export_as_ndjson.yml
index eee61f4ce26..f39b892f18a 100644
--- a/config/feature_flags/development/project_export_as_ndjson.yml
+++ b/config/feature_flags/development/project_export_as_ndjson.yml
@@ -1,7 +1,7 @@
 ---
 name: project_export_as_ndjson
-introduced_by_url: 
-rollout_issue_url: 
-group: 
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/26995
+rollout_issue_url:
+group: group::import
 type: development
 default_enabled: true
diff --git a/config/feature_flags/development/project_import_ndjson.yml b/config/feature_flags/development/project_import_ndjson.yml
index a7971d462fe..8dc924a97c2 100644
--- a/config/feature_flags/development/project_import_ndjson.yml
+++ b/config/feature_flags/development/project_import_ndjson.yml
@@ -1,7 +1,7 @@
 ---
 name: project_import_ndjson
-introduced_by_url: 
-rollout_issue_url: 
-group: 
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/27206
+rollout_issue_url:
+group: group::import
 type: development
 default_enabled: true
diff --git a/config/feature_flags/development/release_evidence.yml b/config/feature_flags/development/release_evidence.yml
index a19994d51a7..c2f7ab16332 100644
--- a/config/feature_flags/development/release_evidence.yml
+++ b/config/feature_flags/development/release_evidence.yml
@@ -1,7 +1,7 @@
 ---
 name: release_evidence
-introduced_by_url: 
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/26509
 rollout_issue_url: 
-group: 
+group: group::release management
 type: development
 default_enabled: true
diff --git a/config/feature_flags/development/settings_operations_prometheus_service.yml b/config/feature_flags/development/settings_operations_prometheus_service.yml
index de2df4b219d..87da3448143 100644
--- a/config/feature_flags/development/settings_operations_prometheus_service.yml
+++ b/config/feature_flags/development/settings_operations_prometheus_service.yml
@@ -1,7 +1,7 @@
 ---
 name: settings_operations_prometheus_service
-introduced_by_url: 
-rollout_issue_url: 
-group: 
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/24727
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/258560
+group: group::health
 type: development
 default_enabled: false