Add latest changes from gitlab-org/gitlab@15-2-stable-eev15.2.0-rc42

8 files changed, 22 insertions, 6 deletions

diff --git a/config/feature_flags/experiment/combined_registration.yml b/config/feature_flags/experiment/combined_registration.yml
index 1be740c7141..0b867353946 100644
--- a/config/feature_flags/experiment/combined_registration.yml
+++ b/config/feature_flags/experiment/combined_registration.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67614
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/285533
 milestone: '14.3'
 type: experiment
-group: group::adoption
+group: group::acquisition
 default_enabled: false
diff --git a/config/feature_flags/experiment/invite_members_in_side_nav.yml b/config/feature_flags/experiment/invite_members_in_side_nav.yml
index 7968a885374..1cb8d6d2b0a 100644
--- a/config/feature_flags/experiment/invite_members_in_side_nav.yml
+++ b/config/feature_flags/experiment/invite_members_in_side_nav.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70451
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/342951
 milestone: '14.5'
 type: experiment
-group: group::expansion
+group: group::acquisition
 default_enabled: false
diff --git a/config/feature_flags/experiment/null_hypothesis.yml b/config/feature_flags/experiment/null_hypothesis.yml
index 8ac76809842..bf1526fa950 100644
--- a/config/feature_flags/experiment/null_hypothesis.yml
+++ b/config/feature_flags/experiment/null_hypothesis.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45840
 rollout_issue_url:
 milestone: '13.7'
 type: experiment
-group: group::adoption
+group: group::acquisition
 default_enabled: false
diff --git a/config/feature_flags/experiment/pql_three_cta_test.yml b/config/feature_flags/experiment/pql_three_cta_test.yml
index f65d3080c05..aa46c51d7ed 100644
--- a/config/feature_flags/experiment/pql_three_cta_test.yml
+++ b/config/feature_flags/experiment/pql_three_cta_test.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74054
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/349799
 milestone: '14.7'
 type: experiment
-group: group::conversion
+group: group::acquisition
 default_enabled: false
diff --git a/config/feature_flags/experiment/security_actions_continuous_onboarding.yml b/config/feature_flags/experiment/security_actions_continuous_onboarding.yml
new file mode 100644
index 00000000000..ce7124cf0c8
--- /dev/null
+++ b/config/feature_flags/experiment/security_actions_continuous_onboarding.yml
@@ -0,0 +1,8 @@
+---
+name: security_actions_continuous_onboarding
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82274
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345176
+milestone: '15.2'
+type: experiment
+group: group::acquisition
+default_enabled: false
diff --git a/config/feature_flags/experiment/security_reports_mr_widget_prompt.yml b/config/feature_flags/experiment/security_reports_mr_widget_prompt.yml
index ca6d17b1720..16cc3d890d7 100644
--- a/config/feature_flags/experiment/security_reports_mr_widget_prompt.yml
+++ b/config/feature_flags/experiment/security_reports_mr_widget_prompt.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70086
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/340436
 milestone: '14.3'
 type: experiment
-group: group::adoption
+group: group::acquisition
 default_enabled: false
diff --git a/config/feature_flags/experiment/showcase_free_security_features.yml b/config/feature_flags/experiment/showcase_free_security_features.yml
new file mode 100644
index 00000000000..e9a55d03adc
--- /dev/null
+++ b/config/feature_flags/experiment/showcase_free_security_features.yml
@@ -0,0 +1,8 @@
+---
+name: showcase_free_security_features
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85359
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/360677
+milestone: '15.2'
+type: experiment
+group: group::acquisition
+default_enabled: false
diff --git a/config/feature_flags/experiment/video_tutorials_continuous_onboarding.yml b/config/feature_flags/experiment/video_tutorials_continuous_onboarding.yml
index 6dc3f798f63..e047a4e9682 100644
--- a/config/feature_flags/experiment/video_tutorials_continuous_onboarding.yml
+++ b/config/feature_flags/experiment/video_tutorials_continuous_onboarding.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82274
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/351916
 milestone: '14.9'
 type: experiment
-group: group::adoption
+group: group::acquisition
 default_enabled: false