Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-10-25 00:06:26 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2019-10-25 00:06:26 +0300
commit46bfa73d93786bc2a832be7e42e2119712a0bafb (patch)
treeda48cc5babc92871cda768a980042aeb061c5ace /lib/gitlab/tracking.rb
parentc4edbefa458319a81e238f8f034d19f6ea6292ca (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/tracking.rb')
-rw-r--r--lib/gitlab/tracking.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/gitlab/tracking.rb b/lib/gitlab/tracking.rb
index d254d64dad2..2470685bc00 100644
--- a/lib/gitlab/tracking.rb
+++ b/lib/gitlab/tracking.rb
@@ -39,7 +39,7 @@ module Gitlab
snowplow.track_self_describing_event(event_json, context, Time.now.to_i)
end
- def snowplow_options(group, user)
+ def snowplow_options(group)
additional_features = Feature.enabled?(:additional_snowplow_tracking, group)
{
namespace: SNOWPLOW_NAMESPACE,
@@ -47,8 +47,7 @@ module Gitlab
cookie_domain: Gitlab::CurrentSettings.snowplow_cookie_domain,
app_id: Gitlab::CurrentSettings.snowplow_site_id,
form_tracking: additional_features,
- link_click_tracking: additional_features,
- user_id: user&.id
+ link_click_tracking: additional_features
}.transform_keys! { |key| key.to_s.camelize(:lower).to_sym }
end