Add latest changes from gitlab-org/gitlab@master

2 files changed, 13 insertions, 5 deletions

diff --git a/config/feature_flags/development/delayed_repository_update_mirror_worker.yml b/config/feature_flags/development/search_index_partitioning_notes.yml
index acf5902716e..1abd3be35c5 100644
--- a/config/feature_flags/development/delayed_repository_update_mirror_worker.yml
+++ b/config/feature_flags/development/search_index_partitioning_notes.yml
@@ -1,8 +1,8 @@
 ---
-name: delayed_repository_update_mirror_worker
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/89501
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/362894
-milestone: '15.1'
+name: search_index_partitioning_notes
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/112402
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/392376
+milestone: '15.10'
 type: development
-group: group::source code
+group: group::global search
 default_enabled: false
diff --git a/config/feature_flags/development/user_search_simple_query_string.yml b/config/feature_flags/development/user_search_simple_query_string.yml
new file mode 100644
index 00000000000..78230c0fef9
--- /dev/null
+++ b/config/feature_flags/development/user_search_simple_query_string.yml
@@ -0,0 +1,8 @@
+---
+name: user_search_simple_query_string
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110623
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/391955
+milestone: '15.10'
+type: development
+group: group::global search
+default_enabled: false