Merge branch 'release/0.5.2'

adopted-ember-addons · Dec 2, 2015 · a9e8c60 · a9e8c60
2 parents 0b50f7f + 7452fbf
commit a9e8c60
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -57,28 +57,28 @@ module.exports = function(environment) {
     metricsAdapters: [
       {
         name: 'GoogleAnalytics',
-        environments: ['development', 'production']
+        environments: ['development', 'production'],
         config: {
           id: 'UA-XXXX-Y'
         }
       },
       {
         name: 'Mixpanel',
-        environments: ['production']
+        environments: ['production'],
         config: {
           token: '0f76c037-4d76-4fce-8a0f-a9a8f89d1453'
         }
       },
       {
         name: 'Segment',
-        environments: ['production']
+        environments: ['production'],
         config: {
           key: '4fce-8a0f-a9a8f89d1453'
         }
       },
       {
         name: 'LocalAdapter',
-        environments: ['all'] // default
+        environments: ['all'], // default
         config: {
           foo: 'bar'
         }

diff --git a/app/initializers/metrics.js b/app/initializers/metrics.js
@@ -2,7 +2,7 @@ import config from '../config/environment';
 
 export function initialize() {
   const application = arguments[1] || arguments[0];
-  const { metricsAdapters = {} } = config;
+  const { metricsAdapters = [] } = config;
   const { environment = 'development' } = config;
   const options = { metricsAdapters, environment };
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-metrics",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "Send data to multiple analytics integrations without re-implementing new API",
   "directories": {
     "doc": "doc",