Merge branch 'dev' into XW-4301

app/components/article-media-map-thumbnail.js

@@ -1,6 +1,5 @@
 import {inject as service} from '@ember/service';
 import Component from '@ember/component';
-import {track, trackActions} from '../utils/track';
 import RenderComponentMixin from '../mixins/render-component';
 
 export default Component.extend(RenderComponentMixin, {
@@ -19,12 +18,6 @@ export default Component.extend(RenderComponentMixin, {
 		if (url) {
 			this.get('logger').debug('Handling map with id:', id, 'and title:', title);
 
-			track({
-				action: trackActions.click,
-				category: 'map',
-				label: 'open'
-			});
-
 			this.get('openLightbox')('map', {
 				id,
 				title,

app/controllers/application.js

@@ -6,13 +6,10 @@ import Controller, {inject as controller} from '@ember/controller';
 import MediaModel from '../models/media';
 import AlertNotificationsMixin from '../mixins/alert-notifications';
 import NoScrollMixin from '../mixins/no-scroll';
-import ConnectionTypeMixin from '../mixins/connection-type';
-import {track, trackActions} from '../utils/track';
 
 export default Controller.extend(
 	AlertNotificationsMixin,
 	NoScrollMixin,
-	ConnectionTypeMixin,
 	{
 		// This has to be here because we need to access media from ArticleController model to open
 		// lightbox TODO: Should be refactored when decoupling article from application
@@ -58,23 +55,7 @@ export default Controller.extend(
 				language: this.get('wikiVariables.language')
 			});
 
-			// This event is for tracking mobile sessions between Mercury and WikiaMobile
-			// NOTE: this event won't have additional dimensions set up from API, ie. #19 (articleType)
-			track({
-				action: trackActions.impression,
-				category: 'app',
-				label: 'load'
-			});
-
 			this._super();
-
-			if (this.get('effectiveConnectionType')) {
-				track({
-					action: trackActions.view,
-					category: 'connection-type',
-					label: this.get('effectiveConnectionType')
-				});
-			}
 		},
 
 		actions: {

config/environment.js

@@ -21,7 +21,7 @@ module.exports = function (environment) {
 		},
 		weppy: {
 			enabled: false,
-			host: 'http://speed.wikia.net/__rum',
+			host: 'https://speed.nocookie.net/__rum',
 			samplingRate: 0.1,
 			aggregationInterval: 1000
 		},
@@ -46,11 +46,6 @@ module.exports = function (environment) {
 					id: 'UA-32129071-1',
 					sampleRate: 100
 				},
-				special: {
-					prefix: 'special',
-					id: 'UA-32132943-1',
-					sampleRate: 100
-				},
 				scriptUrl: 'https://www.google-analytics.com/analytics.js'
 			},
 			quantcast: {

mirage/config.js

@@ -11,7 +11,7 @@ export default function () {
 	this.passthrough('https://services.wikia.com/**');
 	this.passthrough('/wikia.php');
 	this.passthrough('/api.php');
-	this.passthrough('http://speed.wikia.net/**');
+	this.passthrough('https://speed.nocookie.net/**');
 
 	// We have /front/main/assets prefix hardcoded in route and testem use /assets
 	// This is a quick (hopefully temporary) fix