Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42

6 files changed, 19 insertions, 11 deletions

diff --git a/config/feature_flags/ops/ci_accept_trace.yml b/config/feature_flags/ops/ci_accept_trace.yml
index 2574e12f4f2..9e386085ab9 100644
--- a/config/feature_flags/ops/ci_accept_trace.yml
+++ b/config/feature_flags/ops/ci_accept_trace.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41304
 rollout_issue_url: 
 milestone: '13.4'
 type: ops
-group: group::continuous integration
+group: group::pipeline execution
 default_enabled: true
diff --git a/config/feature_flags/ops/ci_queueing_disaster_recovery.yml b/config/feature_flags/ops/ci_queueing_disaster_recovery.yml
index 8c87df59e08..6a31c29ec1d 100644
--- a/config/feature_flags/ops/ci_queueing_disaster_recovery.yml
+++ b/config/feature_flags/ops/ci_queueing_disaster_recovery.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56658
 rollout_issue_url:
 milestone: "13.12"
 type: ops
-group: group::continuous integration
+group: group::pipeline execution
 default_enabled: false
diff --git a/config/feature_flags/ops/ci_trace_log_invalid_chunks.yml b/config/feature_flags/ops/ci_trace_log_invalid_chunks.yml
index 2deb3f42995..566290aa617 100644
--- a/config/feature_flags/ops/ci_trace_log_invalid_chunks.yml
+++ b/config/feature_flags/ops/ci_trace_log_invalid_chunks.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44409
 rollout_issue_url: 
 milestone: '13.5'
 type: ops
-group: group::continuous integration
+group: group::pipeline execution
 default_enabled: false
diff --git a/config/feature_flags/ops/ci_trace_overwrite.yml b/config/feature_flags/ops/ci_trace_overwrite.yml
deleted file mode 100644
index 36caa9f6134..00000000000
--- a/config/feature_flags/ops/ci_trace_overwrite.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: ci_trace_overwrite
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41304
-rollout_issue_url: 
-milestone: '13.4'
-type: ops
-group: group::continuous integration
-default_enabled: false
diff --git a/config/feature_flags/ops/dedicated_redis_trace_chunks.yml b/config/feature_flags/ops/dedicated_redis_trace_chunks.yml
new file mode 100644
index 00000000000..1f3da11dfd5
--- /dev/null
+++ b/config/feature_flags/ops/dedicated_redis_trace_chunks.yml
@@ -0,0 +1,8 @@
+---
+name: dedicated_redis_trace_chunks
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62938
+rollout_issue_url: https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/1096
+milestone: '14.0'
+type: ops
+group: team::Scalability
+default_enabled: false
diff --git a/config/feature_flags/ops/dynamic_nonce.yml b/config/feature_flags/ops/dynamic_nonce.yml
new file mode 100644
index 00000000000..6a63eda8862
--- /dev/null
+++ b/config/feature_flags/ops/dynamic_nonce.yml
@@ -0,0 +1,8 @@
+---
+name: dynamic_nonce
+introduced_by_url:
+rollout_issue_url:
+milestone: '14.0'
+type: ops
+group: group::access
+default_enabled: false