Add latest changes from gitlab-org/gitlab@master

21 files changed, 59 insertions, 66 deletions

diff --git a/config/feature_flags/development/default_merge_ref_for_diffs.yml b/config/feature_flags/development/default_merge_ref_for_diffs.yml
index 86d33375193..b982185c1fd 100644
--- a/config/feature_flags/development/default_merge_ref_for_diffs.yml
+++ b/config/feature_flags/development/default_merge_ref_for_diffs.yml
@@ -1,7 +1,7 @@
 ---
 name: default_merge_ref_for_diffs
-introduced_by_url: 
-rollout_issue_url: 
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/34472
+rollout_issue_url:
 type: development
-group:
+group: group::source code
 default_enabled: false
diff --git a/config/feature_flags/development/design_management_allow_dangerous_images.yml b/config/feature_flags/development/design_management_allow_dangerous_images.yml
index d1d09f154a4..73c348a69ca 100644
--- a/config/feature_flags/development/design_management_allow_dangerous_images.yml
+++ b/config/feature_flags/development/design_management_allow_dangerous_images.yml
@@ -1,7 +1,7 @@
 ---
 name: design_management_allow_dangerous_images
-introduced_by_url: 
-rollout_issue_url: 
-group: 
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/16160
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/34279
+group: group::knowledge
 type: development
 default_enabled: false
diff --git a/config/feature_flags/development/export_lfs_objects_projects.yml b/config/feature_flags/development/export_lfs_objects_projects.yml
deleted file mode 100644
index 6ef3317de8d..00000000000
--- a/config/feature_flags/development/export_lfs_objects_projects.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-name: export_lfs_objects_projects
-introduced_by_url: 
-rollout_issue_url: 
-group: 
-type: development
-default_enabled: true
diff --git a/config/feature_flags/development/merge_request_widget_graphql.yml b/config/feature_flags/development/merge_request_widget_graphql.yml
index 028553a47f8..cbe76a61fa5 100644
--- a/config/feature_flags/development/merge_request_widget_graphql.yml
+++ b/config/feature_flags/development/merge_request_widget_graphql.yml
@@ -1,7 +1,7 @@
 ---
 name: merge_request_widget_graphql
-introduced_by_url: 
-rollout_issue_url: 
-group: 
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/38311
+rollout_issue_url:
+group: group::source code
 type: development
 default_enabled: false
diff --git a/config/feature_flags/development/product_analytics.yml b/config/feature_flags/development/product_analytics.yml
index 85bef678251..cc1859e149c 100644
--- a/config/feature_flags/development/product_analytics.yml
+++ b/config/feature_flags/development/product_analytics.yml
@@ -1,7 +1,7 @@
 ---
 name: product_analytics
-introduced_by_url: 
-rollout_issue_url: 
-group: 
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/36443
+rollout_issue_url:
+group: group::product_analytics
 type: development
 default_enabled: false
diff --git a/config/feature_flags/development/usage_data_incident_management_alert_assigned.yml b/config/feature_flags/development/usage_data_incident_management_alert_assigned.yml
index 22589d00ae0..a50a3eafa1a 100644
--- a/config/feature_flags/development/usage_data_incident_management_alert_assigned.yml
+++ b/config/feature_flags/development/usage_data_incident_management_alert_assigned.yml
@@ -1,7 +1,7 @@
 ---
 name: usage_data_incident_management_alert_assigned
-introduced_by_url: 
-rollout_issue_url: 
-group: 
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40475
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
+group: group::health
 type: development
 default_enabled: true
diff --git a/config/feature_flags/development/usage_data_incident_management_alert_status_changed.yml b/config/feature_flags/development/usage_data_incident_management_alert_status_changed.yml
index 10f987ecd65..957e316e153 100644
--- a/config/feature_flags/development/usage_data_incident_management_alert_status_changed.yml
+++ b/config/feature_flags/development/usage_data_incident_management_alert_status_changed.yml
@@ -1,7 +1,7 @@
 ---
 name: usage_data_incident_management_alert_status_changed
-introduced_by_url: 
-rollout_issue_url: 
-group: 
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40475
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
+group: group::health
 type: development
 default_enabled: true
diff --git a/config/feature_flags/development/usage_data_incident_management_alert_todo.yml b/config/feature_flags/development/usage_data_incident_management_alert_todo.yml
index 67d18480a56..5e64899978a 100644
--- a/config/feature_flags/development/usage_data_incident_management_alert_todo.yml
+++ b/config/feature_flags/development/usage_data_incident_management_alert_todo.yml
@@ -1,7 +1,7 @@
 ---
 name: usage_data_incident_management_alert_todo
-introduced_by_url: 
-rollout_issue_url: 
-group: 
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40475
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
+group: group::health
 type: development
 default_enabled: true
diff --git a/config/feature_flags/development/usage_data_incident_management_incident_assigned.yml b/config/feature_flags/development/usage_data_incident_management_incident_assigned.yml
index 1b48fe4ac9c..a582a44a3e2 100644
--- a/config/feature_flags/development/usage_data_incident_management_incident_assigned.yml
+++ b/config/feature_flags/development/usage_data_incident_management_incident_assigned.yml
@@ -1,7 +1,7 @@
 ---
 name: usage_data_incident_management_incident_assigned
-introduced_by_url: 
-rollout_issue_url: 
-group: 
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40475
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
+group: group::health
 type: development
 default_enabled: true
diff --git a/config/feature_flags/development/usage_data_incident_management_incident_change_confidential.yml b/config/feature_flags/development/usage_data_incident_management_incident_change_confidential.yml
index 6235382fd59..ad482676132 100644
--- a/config/feature_flags/development/usage_data_incident_management_incident_change_confidential.yml
+++ b/config/feature_flags/development/usage_data_incident_management_incident_change_confidential.yml
@@ -1,7 +1,7 @@
 ---
 name: usage_data_incident_management_incident_change_confidential
-introduced_by_url: 
-rollout_issue_url: 
-group: 
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40475
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
+group: group::health
 type: development
 default_enabled: true
diff --git a/config/feature_flags/development/usage_data_incident_management_incident_closed.yml b/config/feature_flags/development/usage_data_incident_management_incident_closed.yml
index 4f8f9b951ed..943b7a83e5e 100644
--- a/config/feature_flags/development/usage_data_incident_management_incident_closed.yml
+++ b/config/feature_flags/development/usage_data_incident_management_incident_closed.yml
@@ -1,7 +1,7 @@
 ---
 name: usage_data_incident_management_incident_closed
-introduced_by_url: 
-rollout_issue_url: 
-group: 
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40475
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
+group: group::health
 type: development
 default_enabled: true
diff --git a/config/feature_flags/development/usage_data_incident_management_incident_comment.yml b/config/feature_flags/development/usage_data_incident_management_incident_comment.yml
index b41c96d3b04..5d173e1e869 100644
--- a/config/feature_flags/development/usage_data_incident_management_incident_comment.yml
+++ b/config/feature_flags/development/usage_data_incident_management_incident_comment.yml
@@ -1,7 +1,7 @@
 ---
 name: usage_data_incident_management_incident_comment
-introduced_by_url: 
-rollout_issue_url: 
-group: 
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40475
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
+group: group::health
 type: development
 default_enabled: true
diff --git a/config/feature_flags/development/usage_data_incident_management_incident_created.yml b/config/feature_flags/development/usage_data_incident_management_incident_created.yml
index 693cc23dc3b..86e47d54d18 100644
--- a/config/feature_flags/development/usage_data_incident_management_incident_created.yml
+++ b/config/feature_flags/development/usage_data_incident_management_incident_created.yml
@@ -1,7 +1,7 @@
 ---
 name: usage_data_incident_management_incident_created
-introduced_by_url: 
-rollout_issue_url: 
-group: 
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40475
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
+group: group::health
 type: development
 default_enabled: true
diff --git a/config/feature_flags/development/usage_data_incident_management_incident_relate.yml b/config/feature_flags/development/usage_data_incident_management_incident_relate.yml
index 70b4c5c3f65..84ba0d34cc7 100644
--- a/config/feature_flags/development/usage_data_incident_management_incident_relate.yml
+++ b/config/feature_flags/development/usage_data_incident_management_incident_relate.yml
@@ -1,7 +1,7 @@
 ---
 name: usage_data_incident_management_incident_relate
-introduced_by_url: 
-rollout_issue_url: 
-group: 
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40475
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
+group: group::health
 type: development
 default_enabled: true
diff --git a/config/feature_flags/development/usage_data_incident_management_incident_reopened.yml b/config/feature_flags/development/usage_data_incident_management_incident_reopened.yml
index ccb108a4a28..ed71d353cfe 100644
--- a/config/feature_flags/development/usage_data_incident_management_incident_reopened.yml
+++ b/config/feature_flags/development/usage_data_incident_management_incident_reopened.yml
@@ -1,7 +1,7 @@
 ---
 name: usage_data_incident_management_incident_reopened
-introduced_by_url: 
-rollout_issue_url: 
-group: 
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40475
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
+group: group::health
 type: development
 default_enabled: true
diff --git a/config/feature_flags/development/usage_data_incident_management_incident_todo.yml b/config/feature_flags/development/usage_data_incident_management_incident_todo.yml
index c517a66a151..aa400fb4455 100644
--- a/config/feature_flags/development/usage_data_incident_management_incident_todo.yml
+++ b/config/feature_flags/development/usage_data_incident_management_incident_todo.yml
@@ -1,7 +1,7 @@
 ---
 name: usage_data_incident_management_incident_todo
-introduced_by_url: 
-rollout_issue_url: 
-group: 
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40475
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
+group: group::health
 type: development
 default_enabled: true
diff --git a/config/feature_flags/development/usage_data_incident_management_incident_unrelate.yml b/config/feature_flags/development/usage_data_incident_management_incident_unrelate.yml
index da418eb79a4..5798331175e 100644
--- a/config/feature_flags/development/usage_data_incident_management_incident_unrelate.yml
+++ b/config/feature_flags/development/usage_data_incident_management_incident_unrelate.yml
@@ -1,7 +1,7 @@
 ---
 name: usage_data_incident_management_incident_unrelate
-introduced_by_url: 
-rollout_issue_url: 
-group: 
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40475
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
+group: group::health
 type: development
 default_enabled: true
diff --git a/config/feature_flags/development/usage_data_incident_management_incident_zoom_meeting.yml b/config/feature_flags/development/usage_data_incident_management_incident_zoom_meeting.yml
index bbe81fdf3ed..921c466a167 100644
--- a/config/feature_flags/development/usage_data_incident_management_incident_zoom_meeting.yml
+++ b/config/feature_flags/development/usage_data_incident_management_incident_zoom_meeting.yml
@@ -1,7 +1,7 @@
 ---
 name: usage_data_incident_management_incident_zoom_meeting
-introduced_by_url: 
-rollout_issue_url: 
-group: 
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40475
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
+group: group::health
 type: development
 default_enabled: true
diff --git a/config/feature_flags/development/view_diffs_file_by_file.yml b/config/feature_flags/development/view_diffs_file_by_file.yml
index 4df755943ab..2ac8a7c3087 100644
--- a/config/feature_flags/development/view_diffs_file_by_file.yml
+++ b/config/feature_flags/development/view_diffs_file_by_file.yml
@@ -1,7 +1,7 @@
 ---
 name: view_diffs_file_by_file
-introduced_by_url: 
-rollout_issue_url: 
-group: 
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/35223
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229848
+group: group::source code
 type: development
 default_enabled: true
diff --git a/config/feature_flags/development/web_ide_primary_edit.yml b/config/feature_flags/development/web_ide_primary_edit.yml
index 8bea7fd94e7..33e3db0322b 100644
--- a/config/feature_flags/development/web_ide_primary_edit.yml
+++ b/config/feature_flags/development/web_ide_primary_edit.yml
@@ -1,7 +1,7 @@
 ---
 name: web_ide_primary_edit
-introduced_by_url: 
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/35957
 rollout_issue_url: 
-group: 
+group: group::editor
 type: development
 default_enabled: false
diff --git a/config/feature_flags/development/widget_visibility_polling.yml b/config/feature_flags/development/widget_visibility_polling.yml
index c0c6962a46d..711d4be2fd1 100644
--- a/config/feature_flags/development/widget_visibility_polling.yml
+++ b/config/feature_flags/development/widget_visibility_polling.yml
@@ -1,7 +1,7 @@
 ---
 name: widget_visibility_polling
-introduced_by_url: 
-rollout_issue_url: 
-group: 
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/29318
+rollout_issue_url:
+group: group::source code
 type: development
 default_enabled: true