Add latest changes from gitlab-org/gitlab@master

1 files changed, 5 insertions, 1 deletions

diff --git a/app/assets/javascripts/tracking/tracking.js b/app/assets/javascripts/tracking/tracking.js
index c26abc261ed..173eef0646b 100644
--- a/app/assets/javascripts/tracking/tracking.js
+++ b/app/assets/javascripts/tracking/tracking.js
@@ -10,6 +10,8 @@ import {
   addReferrersCacheEntry,
 } from './utils';
 
+const ALLOWED_URL_HASHES = ['#diff', '#note'];
+
 export default class Tracking {
   static queuedEvents = [];
   static initialized = false;
@@ -183,7 +185,9 @@ export default class Tracking {
       originalUrl: window.location.href,
     });
 
-    window.snowplow('setCustomUrl', pageLinks.url);
+    const appendHash = ALLOWED_URL_HASHES.some((prefix) => window.location.hash.startsWith(prefix));
+    const customUrl = `${pageUrl}${appendHash ? window.location.hash : ''}`;
+    window.snowplow('setCustomUrl', customUrl);
 
     if (document.referrer) {
       const node = referrers.find((links) => links.originalUrl === document.referrer);