From 1eb4aaa5bd837e3deca97c8fbd98d63f53df07ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= <ayufan@ayufan.eu>
Date: Thu, 17 Dec 2020 17:23:18 +0000
Subject: [PATCH] Revert "Merge branch
 '290724-experiments-using-flipper-will-require-feature-flag-yml-files' into
 'master'"

This reverts merge request !49244
---
 .../feature_flags/experiment/null_hypothesis.yml          | 0
 .../ci_notification_dot_experiment_percentage.yml         | 8 --------
 .../contact_sales_btn_in_app_experiment_percentage.yml    | 8 --------
 .../customize_homepage_experiment_percentage.yml          | 8 --------
 .../default_to_issues_board_experiment_percentage.yml     | 8 --------
 .../group_only_trials_experiment_percentage.yml           | 8 --------
 ...embers_empty_group_version_a_experiment_percentage.yml | 8 --------
 ...bers_empty_project_version_a_experiment_percentage.yml | 8 --------
 .../invite_members_version_a_experiment_percentage.yml    | 8 --------
 .../invite_members_version_b_experiment_percentage.yml    | 8 --------
 .../experiment/jobs_empty_state_experiment_percentage.yml | 8 --------
 .../onboarding_issues_experiment_percentage.yml           | 8 --------
 ...move_known_trial_form_fields_experiment_percentage.yml | 8 --------
 ...istration_with_social_signin_experiment_percentage.yml | 8 --------
 .../trimmed_skip_trial_copy_experiment_percentage.yml     | 8 --------
 .../upgrade_link_in_user_menu_a_experiment_percentage.yml | 8 --------
 lib/feature/shared.rb                                     | 2 --
 lib/gitlab/experimentation/experiment.rb                  | 4 +---
 spec/support/helpers/stub_experiments.rb                  | 4 ----
 19 files changed, 1 insertion(+), 129 deletions(-)
 rename {ee/config => config}/feature_flags/experiment/null_hypothesis.yml (100%)
 delete mode 100644 ee/config/feature_flags/experiment/ci_notification_dot_experiment_percentage.yml
 delete mode 100644 ee/config/feature_flags/experiment/contact_sales_btn_in_app_experiment_percentage.yml
 delete mode 100644 ee/config/feature_flags/experiment/customize_homepage_experiment_percentage.yml
 delete mode 100644 ee/config/feature_flags/experiment/default_to_issues_board_experiment_percentage.yml
 delete mode 100644 ee/config/feature_flags/experiment/group_only_trials_experiment_percentage.yml
 delete mode 100644 ee/config/feature_flags/experiment/invite_members_empty_group_version_a_experiment_percentage.yml
 delete mode 100644 ee/config/feature_flags/experiment/invite_members_empty_project_version_a_experiment_percentage.yml
 delete mode 100644 ee/config/feature_flags/experiment/invite_members_version_a_experiment_percentage.yml
 delete mode 100644 ee/config/feature_flags/experiment/invite_members_version_b_experiment_percentage.yml
 delete mode 100644 ee/config/feature_flags/experiment/jobs_empty_state_experiment_percentage.yml
 delete mode 100644 ee/config/feature_flags/experiment/onboarding_issues_experiment_percentage.yml
 delete mode 100644 ee/config/feature_flags/experiment/remove_known_trial_form_fields_experiment_percentage.yml
 delete mode 100644 ee/config/feature_flags/experiment/trial_registration_with_social_signin_experiment_percentage.yml
 delete mode 100644 ee/config/feature_flags/experiment/trimmed_skip_trial_copy_experiment_percentage.yml
 delete mode 100644 ee/config/feature_flags/experiment/upgrade_link_in_user_menu_a_experiment_percentage.yml

diff --git a/ee/config/feature_flags/experiment/null_hypothesis.yml b/config/feature_flags/experiment/null_hypothesis.yml
similarity index 100%
rename from ee/config/feature_flags/experiment/null_hypothesis.yml
rename to config/feature_flags/experiment/null_hypothesis.yml
diff --git a/ee/config/feature_flags/experiment/ci_notification_dot_experiment_percentage.yml b/ee/config/feature_flags/experiment/ci_notification_dot_experiment_percentage.yml
deleted file mode 100644
index 3d6f70d2ce578f..00000000000000
--- a/ee/config/feature_flags/experiment/ci_notification_dot_experiment_percentage.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: ci_notification_dot_experiment_percentage
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/27626
-rollout_issue_url: https://gitlab.com/gitlab-org/growth/team-tasks/-/issues/101
-milestone: '12.10'
-type: experiment
-group: group::expansion
-default_enabled: false
diff --git a/ee/config/feature_flags/experiment/contact_sales_btn_in_app_experiment_percentage.yml b/ee/config/feature_flags/experiment/contact_sales_btn_in_app_experiment_percentage.yml
deleted file mode 100644
index 80401523f53e96..00000000000000
--- a/ee/config/feature_flags/experiment/contact_sales_btn_in_app_experiment_percentage.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: contact_sales_btn_in_app_experiment_percentage
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/38508
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/238207
-milestone: '13.3'
-type: experiment
-group: group::conversion
-default_enabled: true
diff --git a/ee/config/feature_flags/experiment/customize_homepage_experiment_percentage.yml b/ee/config/feature_flags/experiment/customize_homepage_experiment_percentage.yml
deleted file mode 100644
index eff0d2785eb448..00000000000000
--- a/ee/config/feature_flags/experiment/customize_homepage_experiment_percentage.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: customize_homepage_experiment_percentage
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/39348
-rollout_issue_url: https://gitlab.com/gitlab-org/growth/team-tasks/-/issues/187
-milestone: '13.4'
-type: experiment
-group: group::expansion
-default_enabled: false
diff --git a/ee/config/feature_flags/experiment/default_to_issues_board_experiment_percentage.yml b/ee/config/feature_flags/experiment/default_to_issues_board_experiment_percentage.yml
deleted file mode 100644
index d4a695502f9450..00000000000000
--- a/ee/config/feature_flags/experiment/default_to_issues_board_experiment_percentage.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: default_to_issues_board_experiment_percentage
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/43939
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/268298
-milestone: '13.5'
-type: experiment
-group: group::conversion
-default_enabled: true
diff --git a/ee/config/feature_flags/experiment/group_only_trials_experiment_percentage.yml b/ee/config/feature_flags/experiment/group_only_trials_experiment_percentage.yml
deleted file mode 100644
index e410eb08d01723..00000000000000
--- a/ee/config/feature_flags/experiment/group_only_trials_experiment_percentage.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: group_only_trials_experiment_percentage
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40564
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/258629
-milestone: '13.5'
-type: experiment
-group: group::conversion
-default_enabled: false
diff --git a/ee/config/feature_flags/experiment/invite_members_empty_group_version_a_experiment_percentage.yml b/ee/config/feature_flags/experiment/invite_members_empty_group_version_a_experiment_percentage.yml
deleted file mode 100644
index 6f8186a6888bc9..00000000000000
--- a/ee/config/feature_flags/experiment/invite_members_empty_group_version_a_experiment_percentage.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: invite_members_empty_group_version_a_experiment_percentage
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45689
-rollout_issue_url: https://gitlab.com/gitlab-org/growth/team-tasks/-/issues/280
-milestone: '13.6'
-type: experiment
-group: group::expansion
-default_enabled: false
diff --git a/ee/config/feature_flags/experiment/invite_members_empty_project_version_a_experiment_percentage.yml b/ee/config/feature_flags/experiment/invite_members_empty_project_version_a_experiment_percentage.yml
deleted file mode 100644
index 8b91ec9526ccb4..00000000000000
--- a/ee/config/feature_flags/experiment/invite_members_empty_project_version_a_experiment_percentage.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: invite_members_empty_project_version_a_experiment_percentage
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49588
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/262014
-milestone: '13.7'
-type: experiment
-group: group::expansion
-default_enabled: false
diff --git a/ee/config/feature_flags/experiment/invite_members_version_a_experiment_percentage.yml b/ee/config/feature_flags/experiment/invite_members_version_a_experiment_percentage.yml
deleted file mode 100644
index b284a0e2f78fca..00000000000000
--- a/ee/config/feature_flags/experiment/invite_members_version_a_experiment_percentage.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: invite_members_version_a_experiment_percentage
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45689/
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/219239
-milestone: '13.6'
-type: experiment
-group: group::expansion
-default_enabled: false
diff --git a/ee/config/feature_flags/experiment/invite_members_version_b_experiment_percentage.yml b/ee/config/feature_flags/experiment/invite_members_version_b_experiment_percentage.yml
deleted file mode 100644
index 069e740ba44089..00000000000000
--- a/ee/config/feature_flags/experiment/invite_members_version_b_experiment_percentage.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: invite_members_version_b_experiment_percentage
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/43900
-rollout_issue_url: https://gitlab.com/gitlab-org/growth/team-tasks/-/issues/214
-milestone: '13.5'
-type: experiment
-group: group::expansion
-default_enabled: false
diff --git a/ee/config/feature_flags/experiment/jobs_empty_state_experiment_percentage.yml b/ee/config/feature_flags/experiment/jobs_empty_state_experiment_percentage.yml
deleted file mode 100644
index 33a15e28d445d0..00000000000000
--- a/ee/config/feature_flags/experiment/jobs_empty_state_experiment_percentage.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: jobs_empty_state_experiment_percentage
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48686
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/281054
-milestone: '13.7'
-type: experiment
-group: group::activation
-default_enabled: false
diff --git a/ee/config/feature_flags/experiment/onboarding_issues_experiment_percentage.yml b/ee/config/feature_flags/experiment/onboarding_issues_experiment_percentage.yml
deleted file mode 100644
index 7a8f3074d96c5e..00000000000000
--- a/ee/config/feature_flags/experiment/onboarding_issues_experiment_percentage.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: onboarding_issues_experiment_percentage
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/31656/
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/224515
-milestone: '13.0'
-type: experiment
-group: group::conversion
-default_enabled: true
diff --git a/ee/config/feature_flags/experiment/remove_known_trial_form_fields_experiment_percentage.yml b/ee/config/feature_flags/experiment/remove_known_trial_form_fields_experiment_percentage.yml
deleted file mode 100644
index 72b49a0423546e..00000000000000
--- a/ee/config/feature_flags/experiment/remove_known_trial_form_fields_experiment_percentage.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: remove_known_trial_form_fields_experiment_percentage
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45634/
-rollout_issue_url: https://gitlab.com/gitlab-org/growth/team-tasks/-/issues/281
-milestone: '13.7'
-type: experiment
-group: group::conversion
-default_enabled: false
diff --git a/ee/config/feature_flags/experiment/trial_registration_with_social_signin_experiment_percentage.yml b/ee/config/feature_flags/experiment/trial_registration_with_social_signin_experiment_percentage.yml
deleted file mode 100644
index e0f224ae0c45f7..00000000000000
--- a/ee/config/feature_flags/experiment/trial_registration_with_social_signin_experiment_percentage.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: trial_registration_with_social_signin_experiment_percentage
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45633
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/262853
-milestone: '13.7'
-type: experiment
-group: group::conversion
-default_enabled: false
diff --git a/ee/config/feature_flags/experiment/trimmed_skip_trial_copy_experiment_percentage.yml b/ee/config/feature_flags/experiment/trimmed_skip_trial_copy_experiment_percentage.yml
deleted file mode 100644
index 6e6e4555a6b5b5..00000000000000
--- a/ee/config/feature_flags/experiment/trimmed_skip_trial_copy_experiment_percentage.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: trimmed_skip_trial_copy_experiment_percentage
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48110
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/284956
-milestone: '13.7'
-type: experiment
-group: group::conversion
-default_enabled: false
diff --git a/ee/config/feature_flags/experiment/upgrade_link_in_user_menu_a_experiment_percentage.yml b/ee/config/feature_flags/experiment/upgrade_link_in_user_menu_a_experiment_percentage.yml
deleted file mode 100644
index e383e7040db39e..00000000000000
--- a/ee/config/feature_flags/experiment/upgrade_link_in_user_menu_a_experiment_percentage.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: upgrade_link_in_user_menu_a_experiment_percentage
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/29428
-rollout_issue_url: https://gitlab.com/gitlab-org/growth/team-tasks/-/issues/126
-milestone: '13.0'
-type: experiment
-group: group::expansion
-default_enabled: false
diff --git a/lib/feature/shared.rb b/lib/feature/shared.rb
index a3f02156d94b2c..17dfe26bd8276f 100644
--- a/lib/feature/shared.rb
+++ b/lib/feature/shared.rb
@@ -57,8 +57,6 @@ module Shared
         default_enabled: false,
         example: <<-EOS
           experiment(:my_experiment, project: project, actor: current_user) { ...variant code... }
-          # or
-          Gitlab::Experimentation.in_experiment_group?(:my_experiment, subject: current_user)
         EOS
       }
     }.freeze
diff --git a/lib/gitlab/experimentation/experiment.rb b/lib/gitlab/experimentation/experiment.rb
index b9eda0cfc3163b..e594c3bedeb444 100644
--- a/lib/gitlab/experimentation/experiment.rb
+++ b/lib/gitlab/experimentation/experiment.rb
@@ -3,8 +3,6 @@
 module Gitlab
   module Experimentation
     class Experiment
-      FEATURE_FLAG_SUFFIX = "_experiment_percentage"
-
       attr_reader :key, :tracking_category, :use_backwards_compatible_subject_index
 
       def initialize(key, **params)
@@ -12,7 +10,7 @@ def initialize(key, **params)
         @tracking_category = params[:tracking_category]
         @use_backwards_compatible_subject_index = params[:use_backwards_compatible_subject_index]
 
-        @experiment_percentage = Feature.get(:"#{key}#{FEATURE_FLAG_SUFFIX}").percentage_of_time_value # rubocop:disable Gitlab/AvoidFeatureGet
+        @experiment_percentage = Feature.get(:"#{key}_experiment_percentage").percentage_of_time_value # rubocop:disable Gitlab/AvoidFeatureGet
       end
 
       def active?
diff --git a/spec/support/helpers/stub_experiments.rb b/spec/support/helpers/stub_experiments.rb
index 9188bc704c1365..247692d83ee3b0 100644
--- a/spec/support/helpers/stub_experiments.rb
+++ b/spec/support/helpers/stub_experiments.rb
@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 module StubExperiments
-  SUFFIX = Gitlab::Experimentation::Experiment::FEATURE_FLAG_SUFFIX
-
   # Stub Experiment with `key: true/false`
   #
   # @param [Hash] experiment where key is feature name and value is boolean whether active or not.
@@ -13,7 +11,6 @@ def stub_experiment(experiments)
     allow(Gitlab::Experimentation).to receive(:active?).and_call_original
 
     experiments.each do |experiment_key, enabled|
-      Feature.persist_used!("#{experiment_key}#{SUFFIX}")
       allow(Gitlab::Experimentation).to receive(:active?).with(experiment_key) { enabled }
     end
   end
@@ -28,7 +25,6 @@ def stub_experiment_for_subject(experiments)
     allow(Gitlab::Experimentation).to receive(:in_experiment_group?).and_call_original
 
     experiments.each do |experiment_key, enabled|
-      Feature.persist_used!("#{experiment_key}#{SUFFIX}")
       allow(Gitlab::Experimentation).to receive(:in_experiment_group?).with(experiment_key, anything) { enabled }
     end
   end
-- 
GitLab