Add latest changes from gitlab-org/gitlab@master

6 files changed, 18 insertions, 18 deletions

diff --git a/config/feature_flags/development/ci_pipeline_editor_page.yml b/config/feature_flags/development/ci_pipeline_editor_page.yml
index 9870f419842..313126f3444 100644
--- a/config/feature_flags/development/ci_pipeline_editor_page.yml
+++ b/config/feature_flags/development/ci_pipeline_editor_page.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/270059
 milestone: '13.6'
 type: development
 group: group::pipeline authoring
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/ci_slow_artifacts_removal.yml b/config/feature_flags/development/ci_slow_artifacts_removal.yml
deleted file mode 100644
index a255a6cff1f..00000000000
--- a/config/feature_flags/development/ci_slow_artifacts_removal.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: ci_slow_artifacts_removal
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/47496
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/281688
-milestone: '13.8'
-type: development
-group: 'group::continuous integration'
-default_enabled: false
diff --git a/config/feature_flags/development/ci_split_pipeline_artifacts_removal.yml b/config/feature_flags/development/ci_split_pipeline_artifacts_removal.yml
deleted file mode 100644
index be56931a331..00000000000
--- a/config/feature_flags/development/ci_split_pipeline_artifacts_removal.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: ci_split_pipeline_artifacts_removal
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50446
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/295300
-milestone: '13.8'
-type: development
-group: group::continuous integration
-default_enabled: false
diff --git a/config/feature_flags/development/set_user_availability_status.yml b/config/feature_flags/development/set_user_availability_status.yml
index be3ff522ccc..dd48ddef6d5 100644
--- a/config/feature_flags/development/set_user_availability_status.yml
+++ b/config/feature_flags/development/set_user_availability_status.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/281073
 milestone: '13.6'
 type: development
 group: group::optimize
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_create_review_note.yml b/config/feature_flags/development/usage_data_i_code_review_user_create_review_note.yml
new file mode 100644
index 00000000000..fdc3b4569ef
--- /dev/null
+++ b/config/feature_flags/development/usage_data_i_code_review_user_create_review_note.yml
@@ -0,0 +1,8 @@
+---
+name: usage_data_i_code_review_user_create_review_note
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/51521
+rollout_issue_url: 
+milestone: '13.8'
+type: development
+group: group::code review
+default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_code_review_user_publish_review.yml b/config/feature_flags/development/usage_data_i_code_review_user_publish_review.yml
new file mode 100644
index 00000000000..079ceb023f4
--- /dev/null
+++ b/config/feature_flags/development/usage_data_i_code_review_user_publish_review.yml
@@ -0,0 +1,8 @@
+---
+name: usage_data_i_code_review_user_publish_review
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/51351
+rollout_issue_url: 
+milestone: '13.8'
+type: development
+group: group::code review
+default_enabled: true