Add latest changes from gitlab-org/gitlab@master

5 files changed, 8 insertions, 32 deletions

diff --git a/config/feature_flags/development/ci_job_jwt.yml b/config/feature_flags/development/ci_job_jwt.yml
deleted file mode 100644
index 3ce97c6334c..00000000000
--- a/config/feature_flags/development/ci_job_jwt.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: ci_job_jwt
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/28063
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/207125
-milestone: '12.10'
-type: development
-group: group::configure
-default_enabled: true
diff --git a/config/feature_flags/development/externally_stored_diffs_caching_export.yml b/config/feature_flags/development/externally_stored_diffs_caching_export.yml
deleted file mode 100644
index 395ce5c7cb9..00000000000
--- a/config/feature_flags/development/externally_stored_diffs_caching_export.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: externally_stored_diffs_caching_export
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90159
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/366255
-milestone: '15.2'
-type: development
-group: group::import
-default_enabled: false
diff --git a/config/feature_flags/development/merge_request_widget_graphql.yml b/config/feature_flags/development/merge_request_widget_graphql.yml
deleted file mode 100644
index 8d13c6b1c62..00000000000
--- a/config/feature_flags/development/merge_request_widget_graphql.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: merge_request_widget_graphql
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/38311
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/267560
-milestone: '13.3'
-type: development
-group: group::code review
-default_enabled: true
diff --git a/config/feature_flags/development/track_delete_source_errors.yml b/config/feature_flags/development/track_delete_source_errors.yml
deleted file mode 100644
index 57152ed86cd..00000000000
--- a/config/feature_flags/development/track_delete_source_errors.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: track_delete_source_errors
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/99028
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/377258
-milestone: '15.5'
-type: development
-group: group::code review
-default_enabled: false
diff --git a/config/feature_flags/experiment/disable_network_graph_notes_count.yml b/config/feature_flags/experiment/disable_network_graph_notes_count.yml
new file mode 100644
index 00000000000..fa4e5b4e104
--- /dev/null
+++ b/config/feature_flags/experiment/disable_network_graph_notes_count.yml
@@ -0,0 +1,8 @@
+---
+name: disable_network_graph_notes_count
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103636"
+rollout_issue_url: 
+milestone: '15.6'
+type: experiment
+group: group::source code
+default_enabled: false