Commit 42bcc548 authored by Heinrich Lee Yu's avatar Heinrich Lee Yu

Merge branch '323663-remove-references-to-old-tracking-file' into 'master'

Remove all references to former tracking.js file

See merge request gitlab-org/gitlab!64239
parents 3c2a06d2 1d27d3dc
...@@ -549,13 +549,13 @@ Snowplow Micro is a Docker-based solution for testing frontend and backend event ...@@ -549,13 +549,13 @@ Snowplow Micro is a Docker-based solution for testing frontend and backend event
update application_settings set snowplow_collector_hostname='localhost:9090', snowplow_enabled=true, snowplow_cookie_domain='.gitlab.com'; update application_settings set snowplow_collector_hostname='localhost:9090', snowplow_enabled=true, snowplow_cookie_domain='.gitlab.com';
``` ```
1. Update `DEFAULT_SNOWPLOW_OPTIONS` in `app/assets/javascripts/tracking.js` to remove `forceSecureTracker: true`: 1. Update `DEFAULT_SNOWPLOW_OPTIONS` in `app/assets/javascripts/tracking/index.js` to remove `forceSecureTracker: true`:
```diff ```diff
diff --git a/app/assets/javascripts/tracking.js b/app/assets/javascripts/tracking.js diff --git a/app/assets/javascripts/tracking/index.js b/app/assets/javascripts/tracking/index.js
index 0a1211d0a76..3b98c8f28f2 100644 index 0a1211d0a76..3b98c8f28f2 100644
--- a/app/assets/javascripts/tracking.js --- a/app/assets/javascripts/tracking/index.js
+++ b/app/assets/javascripts/tracking.js +++ b/app/assets/javascripts/tracking/index.js
@@ -7,7 +7,6 @@ const DEFAULT_SNOWPLOW_OPTIONS = { @@ -7,7 +7,6 @@ const DEFAULT_SNOWPLOW_OPTIONS = {
appId: '', appId: '',
userFingerprint: false, userFingerprint: false,
......
...@@ -183,7 +183,8 @@ RSpec.describe Tooling::Danger::ProjectHelper do ...@@ -183,7 +183,8 @@ RSpec.describe Tooling::Danger::ProjectHelper do
'lib/generators/rails/usage_metric_definition_generator.rb' | [:backend, :product_intelligence] 'lib/generators/rails/usage_metric_definition_generator.rb' | [:backend, :product_intelligence]
'spec/lib/generators/usage_metric_definition_generator_spec.rb' | [:backend, :product_intelligence] 'spec/lib/generators/usage_metric_definition_generator_spec.rb' | [:backend, :product_intelligence]
'config/metrics/schema.json' | [:product_intelligence] 'config/metrics/schema.json' | [:product_intelligence]
'app/assets/javascripts/tracking.js' | [:frontend, :product_intelligence] 'app/assets/javascripts/tracking/foo.js' | [:frontend, :product_intelligence]
'spec/frontend/tracking/foo.js' | [:frontend, :product_intelligence]
'spec/frontend/tracking_spec.js' | [:frontend, :product_intelligence] 'spec/frontend/tracking_spec.js' | [:frontend, :product_intelligence]
'lib/gitlab/usage_database/foo.rb' | [:backend] 'lib/gitlab/usage_database/foo.rb' | [:backend]
end end
......
...@@ -14,7 +14,10 @@ module Tooling ...@@ -14,7 +14,10 @@ module Tooling
'spec/lib/gitlab/tracking_spec.rb', 'spec/lib/gitlab/tracking_spec.rb',
'app/helpers/tracking_helper.rb', 'app/helpers/tracking_helper.rb',
'spec/helpers/tracking_helper_spec.rb', 'spec/helpers/tracking_helper_spec.rb',
'app/assets/javascripts/tracking.js', 'app/assets/javascripts/tracking/index.js',
'app/assets/javascripts/tracking/constants.js',
'app/assets/javascripts/tracking/get_standard_context.js',
'spec/frontend/tracking/get_standard_context_spec.js',
'spec/frontend/tracking_spec.js', 'spec/frontend/tracking_spec.js',
'generator_templates/usage_metric_definition/metric_definition.yml', 'generator_templates/usage_metric_definition/metric_definition.yml',
'lib/generators/gitlab/usage_metric/usage_metric_generator.rb', 'lib/generators/gitlab/usage_metric/usage_metric_generator.rb',
......
...@@ -43,7 +43,8 @@ module Tooling ...@@ -43,7 +43,8 @@ module Tooling
%r{\Adata/whats_new/} => :docs, %r{\Adata/whats_new/} => :docs,
%r{\A( %r{\A(
app/assets/javascripts/tracking\.js | app/assets/javascripts/tracking/.*\.js |
spec/frontend/tracking/.*\.js |
spec/frontend/tracking_spec\.js spec/frontend/tracking_spec\.js
)\z}x => [:frontend, :product_intelligence], )\z}x => [:frontend, :product_intelligence],
%r{\A(ee/)?app/(assets|views)/} => :frontend, %r{\A(ee/)?app/(assets|views)/} => :frontend,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment