diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-03 00:16:54 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-03 00:16:54 +0300 |
commit | a1ee5ac49b801535223f7498762f0c0820165a1a (patch) | |
tree | 8bfde6b9f8ac7872aa368a2f8d6c657583ec809d /app/experiments | |
parent | 05cde74f482201ed19d89c3c01ebf9b5d26cd4fd (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/experiments')
-rw-r--r-- | app/experiments/application_experiment.rb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/app/experiments/application_experiment.rb b/app/experiments/application_experiment.rb index 859716b4739..2dabf33405d 100644 --- a/app/experiments/application_experiment.rb +++ b/app/experiments/application_experiment.rb @@ -41,10 +41,6 @@ class ApplicationExperiment < Gitlab::Experiment # rubocop:disable Gitlab/Namesp # define a default nil control behavior so we can omit it when not needed end - def track(action, **event_args) - super(action, **tracking_context.merge(event_args)) - end - # TODO: remove # This is deprecated logic as of v0.6.0 and should eventually be removed, but # needs to stay intact for actively running experiments. The new strategy @@ -64,12 +60,12 @@ class ApplicationExperiment < Gitlab::Experiment # rubocop:disable Gitlab/Namesp private - def tracking_context + def tracking_context(event_args) { namespace: context.try(:namespace) || context.try(:group), project: context.try(:project), user: user_or_actor - }.compact || {} + }.merge(event_args) end def user_or_actor |