Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42

2 files changed, 22 insertions, 5 deletions

diff --git a/lib/gitlab/experimentation/controller_concern.rb b/lib/gitlab/experimentation/controller_concern.rb
index c85d3f4eee6..e43f3c8c007 100644
--- a/lib/gitlab/experimentation/controller_concern.rb
+++ b/lib/gitlab/experimentation/controller_concern.rb
@@ -15,7 +15,7 @@ module Gitlab
 
       included do
         before_action :set_experimentation_subject_id_cookie, unless: :dnt_enabled?
-        helper_method :experiment_enabled?, :experiment_tracking_category_and_group
+        helper_method :experiment_enabled?, :experiment_tracking_category_and_group, :tracking_label
       end
 
       def set_experimentation_subject_id_cookie
@@ -130,7 +130,10 @@ module Gitlab
       end
 
       def forced_enabled?(experiment_key)
-        params.has_key?(:force_experiment) && params[:force_experiment] == experiment_key.to_s
+        return true if params.has_key?(:force_experiment) && params[:force_experiment] == experiment_key.to_s
+        return false if cookies[:force_experiment].blank?
+
+        cookies[:force_experiment].to_s.split(',').any? { |experiment| experiment.strip == experiment_key.to_s }
       end
 
       def tracking_label(subject)
diff --git a/lib/gitlab/experimentation/experiment.rb b/lib/gitlab/experimentation/experiment.rb
index e594c3bedeb..36cd673a38f 100644
--- a/lib/gitlab/experimentation/experiment.rb
+++ b/lib/gitlab/experimentation/experiment.rb
@@ -3,17 +3,21 @@
 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)
         @key = key
         @tracking_category = params[:tracking_category]
         @use_backwards_compatible_subject_index = params[:use_backwards_compatible_subject_index]
-
-        @experiment_percentage = Feature.get(:"#{key}_experiment_percentage").percentage_of_time_value # rubocop:disable Gitlab/AvoidFeatureGet
       end
 
       def active?
+        # TODO: just touch a feature flag
+        # Temporary change, we will change `experiment_percentage` in future to `Feature.enabled?
+        Feature.enabled?(feature_flag_name, type: :experiment, default_enabled: :yaml)
+
         ::Gitlab.dev_env_or_com? && experiment_percentage > 0
       end
 
@@ -25,7 +29,17 @@ module Gitlab
 
       private
 
-      attr_reader :experiment_percentage
+      def experiment_percentage
+        feature_flag.percentage_of_time_value
+      end
+
+      def feature_flag
+        Feature.get(feature_flag_name) # rubocop:disable Gitlab/AvoidFeatureGet
+      end
+
+      def feature_flag_name
+        :"#{key}#{FEATURE_FLAG_SUFFIX}"
+      end
     end
   end
 end