Add latest changes from gitlab-org/gitlab@master

6 files changed, 46 insertions, 6 deletions

diff --git a/config/feature_flags/ops/search_index_curation_commits.yml b/config/feature_flags/ops/search_index_curation_commits.yml
new file mode 100644
index 00000000000..4a25284e130
--- /dev/null
+++ b/config/feature_flags/ops/search_index_curation_commits.yml
@@ -0,0 +1,8 @@
+---
+name: search_index_curation_commits
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104423"
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/383093
+milestone: '15.7'
+type: ops
+group: group::global search
+default_enabled: false
diff --git a/config/feature_flags/ops/search_index_curation_issues.yml b/config/feature_flags/ops/search_index_curation_issues.yml
new file mode 100644
index 00000000000..0a695a21796
--- /dev/null
+++ b/config/feature_flags/ops/search_index_curation_issues.yml
@@ -0,0 +1,8 @@
+---
+name: search_index_curation_issues
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104423"
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/383094
+milestone: '15.7'
+type: ops
+group: group::global search
+default_enabled: false
diff --git a/config/feature_flags/development/ci_retry_job_fix.yml b/config/feature_flags/ops/search_index_curation_main_index.yml
index 30782e57dea..7d767de89cd 100644
--- a/config/feature_flags/development/ci_retry_job_fix.yml
+++ b/config/feature_flags/ops/search_index_curation_main_index.yml
@@ -1,8 +1,8 @@
 ---
-name: ci_retry_job_fix
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/100712
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/207988
-milestone: '15.6'
-type: development
-group: group::pipeline execution
+name: search_index_curation_main_index
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104423
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/383106
+milestone: '15.7'
+type: ops
+group: group::global search
 default_enabled: false
diff --git a/config/feature_flags/ops/search_index_curation_merge_requests.yml b/config/feature_flags/ops/search_index_curation_merge_requests.yml
new file mode 100644
index 00000000000..79dcb8be79d
--- /dev/null
+++ b/config/feature_flags/ops/search_index_curation_merge_requests.yml
@@ -0,0 +1,8 @@
+---
+name: search_index_curation_merge_requests
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104423"
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/383095
+milestone: '15.7'
+type: ops
+group: group::global search
+default_enabled: false
diff --git a/config/feature_flags/ops/search_index_curation_notes.yml b/config/feature_flags/ops/search_index_curation_notes.yml
new file mode 100644
index 00000000000..1bba280eb64
--- /dev/null
+++ b/config/feature_flags/ops/search_index_curation_notes.yml
@@ -0,0 +1,8 @@
+---
+name: search_index_curation_notes
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104423"
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/383096
+milestone: '15.7'
+type: ops
+group: group::global search
+default_enabled: false
diff --git a/config/feature_flags/ops/search_index_curation_users.yml b/config/feature_flags/ops/search_index_curation_users.yml
new file mode 100644
index 00000000000..a5383df8ad7
--- /dev/null
+++ b/config/feature_flags/ops/search_index_curation_users.yml
@@ -0,0 +1,8 @@
+---
+name: search_index_curation_users
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104423"
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/383097
+milestone: '15.7'
+type: ops
+group: group::global search
+default_enabled: false