Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42

7 files changed, 3 insertions, 51 deletions

diff --git a/config/feature_flags/experiment/force_company_trial.yml b/config/feature_flags/experiment/force_company_trial.yml
deleted file mode 100644
index 85fc789085d..00000000000
--- a/config/feature_flags/experiment/force_company_trial.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: force_company_trial
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/65287
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/335050
-milestone: '14.1'
-type: experiment
-group: group::adoption
-default_enabled: false
diff --git a/config/feature_flags/experiment/invite_email_from.yml b/config/feature_flags/experiment/invite_email_from.yml
deleted file mode 100644
index 59baf249341..00000000000
--- a/config/feature_flags/experiment/invite_email_from.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: invite_email_from
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68376
-rollout_issue_url: https://gitlab.com/gitlab-org/growth/team-tasks/-/issues/429
-milestone: '14.3'
-type: experiment
-group: group::expansion
-default_enabled: false
diff --git a/config/feature_flags/experiment/invite_email_preview_text.yml b/config/feature_flags/experiment/invite_email_preview_text.yml
deleted file mode 100644
index fcb4cda0b14..00000000000
--- a/config/feature_flags/experiment/invite_email_preview_text.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: invite_email_preview_text
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67236
-rollout_issue_url: https://gitlab.com/gitlab-org/growth/team-tasks/-/issues/421
-milestone: '14.2'
-type: experiment
-group: group::expansion
-default_enabled: false
diff --git a/config/feature_flags/experiment/invite_members_for_task.yml b/config/feature_flags/experiment/invite_for_help_continuous_onboarding.yml
index 30743811f26..398f3bddf8a 100644
--- a/config/feature_flags/experiment/invite_members_for_task.yml
+++ b/config/feature_flags/experiment/invite_for_help_continuous_onboarding.yml
@@ -1,7 +1,7 @@
 ---
-name: invite_members_for_task
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69299
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/339747
+name: invite_for_help_continuous_onboarding
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73846
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345708
 milestone: '14.5'
 type: experiment
 group: group::activation
diff --git a/config/feature_flags/experiment/invite_members_in_comment.yml b/config/feature_flags/experiment/invite_members_in_comment.yml
deleted file mode 100644
index 521574ad71b..00000000000
--- a/config/feature_flags/experiment/invite_members_in_comment.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: invite_members_in_comment
-introduced_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/51400'
-rollout_issue_url: 'https://gitlab.com/gitlab-org/growth/team-tasks/-/issues/300'
-milestone: '13.10'
-type: experiment
-group: group::expansion
-default_enabled: false
diff --git a/config/feature_flags/experiment/invite_members_new_dropdown_experiment_percentage.yml b/config/feature_flags/experiment/invite_members_new_dropdown_experiment_percentage.yml
deleted file mode 100644
index 216726178f1..00000000000
--- a/config/feature_flags/experiment/invite_members_new_dropdown_experiment_percentage.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: invite_members_new_dropdown_experiment_percentage
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50069
-rollout_issue_url: https://gitlab.com/gitlab-org/growth/team-tasks/-/issues/291
-milestone: '13.8'
-type: experiment
-group: group::expansion
-default_enabled: false
diff --git a/config/feature_flags/experiment/member_areas_of_focus.yml b/config/feature_flags/experiment/member_areas_of_focus.yml
deleted file mode 100644
index e728ee7e3d3..00000000000
--- a/config/feature_flags/experiment/member_areas_of_focus.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: member_areas_of_focus
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/65273
-rollout_issue_url: https://gitlab.com/gitlab-org/growth/team-tasks/-/issues/406
-milestone: '14.2'
-type: experiment
-group: group::expansion
-default_enabled: false