Add latest changes from gitlab-org/gitlab@master

2 files changed, 6 insertions, 14 deletions

diff --git a/config/feature_flags/ops/advanced_user_search.yml b/config/feature_flags/development/npm_allow_packages_in_multiple_projects.yml
index 0f52e9f22f0..7541a0dd24e 100644
--- a/config/feature_flags/ops/advanced_user_search.yml
+++ b/config/feature_flags/development/npm_allow_packages_in_multiple_projects.yml
@@ -1,8 +1,8 @@
 ---
-name: advanced_user_search
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102724
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/382542
-milestone: '15.7'
-type: ops
-group: group::global search
+name: npm_allow_packages_in_multiple_projects
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111775
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/391692
+milestone: '15.10'
+type: development
+group: group::package registry
 default_enabled: false
diff --git a/config/feature_flags/ops/advanced_user_index.yml b/config/feature_flags/ops/advanced_user_index.yml
deleted file mode 100644
index 2aa33aa265a..00000000000
--- a/config/feature_flags/ops/advanced_user_index.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: advanced_user_index
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110946
-rollout_issue_url: 
-milestone: '15.9'
-type: ops
-group: group::global_search
-default_enabled: true