diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-23 12:06:03 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-23 12:06:03 +0300 |
| commit | b3e4ec8e8adf4fe96c982124e91b6a05021a9cda (patch) | |
| tree | 5fda0011a7cc7de000186e465e61f893d478a1c8 /lib/gitlab/tracking.rb | |
| parent | 90cdc9391171e1be29b2b57a2e2aad0c02c2a7a9 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/tracking.rb')
| -rw-r--r-- | lib/gitlab/tracking.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/gitlab/tracking.rb b/lib/gitlab/tracking.rb index 2470685bc00..d254d64dad2 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) + def snowplow_options(group, user) additional_features = Feature.enabled?(:additional_snowplow_tracking, group) { namespace: SNOWPLOW_NAMESPACE, @@ -47,7 +47,8 @@ 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 + link_click_tracking: additional_features, + user_id: user&.id }.transform_keys! { |key| key.to_s.camelize(:lower).to_sym } end |