Merge remote-tracking branch 'origin/glimmer' into settings-glimmer

Brocfile.js

@@ -1,55 +0,0 @@
-/* global require, module */
-
-var EmberApp = require('ember-cli/lib/broccoli/ember-app');
-
-var fingerprint,
-    assetsHost;
-
-if (process.env.DISABLE_FINGERPRINTS) {
-  fingerprint = false;
-} else {
-  fingerprint = {
-    extensions: ['js', 'css', 'png', 'jpg', 'gif', 'map', 'svg']
-  };
-
-  if (assetsHost = process.env.ASSETS_HOST) {
-    if (assetsHost.substr(-1) !== '/') {
-      assetsHost = assetsHost + '/'
-    }
-    fingerprint.prepend = assetsHost
-  }
-}
-
-var app = new EmberApp({
-  fingerprint: fingerprint,
-  vendorFiles: {
-    // next line is needed to prevent ember-cli to load
-    // handlebars (it happens automatically in 0.1.x)
-    'handlebars.js': null
-  }
-});
-
-app.import('bower_components/pusher/dist/pusher.js');
-app.import('bower_components/jquery-timeago/jquery.timeago.js');
-app.import('bower_components/visibilityjs/lib/visibility.core.js');
-app.import('bower_components/visibilityjs/lib/visibility.timers.js');
-app.import('bower_components/JavaScript-MD5/js/md5.js');
-app.import('vendor/ansiparse.js');
-app.import('vendor/log.js');
-app.import('vendor/customerio.js');
-app.import('vendor/charmscout.js');
-app.import('bower_components/moment/moment.js');
-// Use `app.import` to add additional libraries to the generated
-// output files.
-//
-// If you need to use different assets in different
-// environments, specify an object as the first parameter. That
-// object's keys should be the environment name and the values
-// should be the asset to use in that environment.
-//
-// If the library that you are including contains AMD or ES6
-// modules that you would like to import into your application
-// please specify an object with the list of modules as keys
-// along with the exports of each module as its value.
-
-module.exports = app.toTree();

bower.json

@@ -3,14 +3,14 @@
   "dependencies": {
     "handlebars": "2.0.0",
     "jquery": "^1.11.1",
-    "ember": "1.11.3",
+    "ember": "1.13.3",
     "ember-data": "1.0.0-beta.16.1",
     "ember-resolver": "~0.1.15",
     "loader.js": "ember-cli/loader.js#1.0.1",
     "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
     "ember-cli-test-loader": "ember-cli/ember-cli-test-loader#0.1.0",
     "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4",
-    "ember-qunit": "0.3.1",
+    "ember-qunit": "0.4.0",
     "ember-qunit-notifications": "0.0.5",
     "qunit": "~1.17.1",
     "visibilityjs": "~1.2.1",

ember-cli-build.js

@@ -0,0 +1,44 @@
+/* global require, module */
+var EmberApp = require('ember-cli/lib/broccoli/ember-app');
+
+module.exports = function(defaults) {
+  var fingerprint,
+      assetsHost;
+
+  if (process.env.DISABLE_FINGERPRINTS) {
+    fingerprint = false;
+  } else {
+    fingerprint = {
+      extensions: ['js', 'css', 'png', 'jpg', 'gif', 'map', 'svg']
+    };
+
+    if (assetsHost = process.env.ASSETS_HOST) {
+      if (assetsHost.substr(-1) !== '/') {
+        assetsHost = assetsHost + '/'
+      }
+      fingerprint.prepend = assetsHost
+    }
+  }
+
+  var app = new EmberApp({
+    fingerprint: fingerprint,
+    vendorFiles: {
+      // next line is needed to prevent ember-cli to load
+      // handlebars (it happens automatically in 0.1.x)
+      'handlebars.js': null
+    }
+  });
+
+  app.import('bower_components/pusher/dist/pusher.js');
+  app.import('bower_components/jquery-timeago/jquery.timeago.js');
+  app.import('bower_components/visibilityjs/lib/visibility.core.js');
+  app.import('bower_components/visibilityjs/lib/visibility.timers.js');
+  app.import('bower_components/JavaScript-MD5/js/md5.js');
+  app.import('vendor/ansiparse.js');
+  app.import('vendor/log.js');
+  app.import('vendor/customerio.js');
+  app.import('vendor/charmscout.js');
+  app.import('bower_components/moment/moment.js');
+
+  return app.toTree();
+};

package.json

@@ -21,23 +21,25 @@
   "devDependencies": {
     "broccoli-asset-rev": "^2.0.2",
     "broccoli-sass": "0.6.5",
-    "ember-cli": "^0.2.3",
-    "ember-cli-app-version": "0.3.3",
+    "ember-cli": "^1.13.1",
+    "ember-cli-app-version": "0.4.0",
     "ember-cli-autoprefixer": "^0.3.0",
     "ember-cli-babel": "5.0.0",
     "ember-cli-coffeescript": "0.10.0",
     "ember-cli-content-security-policy": "0.4.0",
     "ember-cli-dependency-checker": "0.0.8",
     "ember-cli-document-title": "0.1.0",
-    "ember-cli-htmlbars": "0.7.4",
-    "ember-cli-ic-ajax": "0.1.1",
+    "ember-cli-htmlbars": "0.7.9",
+    "ember-cli-htmlbars-inline-precompile": "^0.1.1",
+    "ember-cli-ic-ajax": "0.2.1",
     "ember-cli-inject-live-reload": "^1.3.0",
     "ember-cli-inline-images": "^0.0.4",
     "ember-cli-pretender": "0.3.1",
-    "ember-cli-qunit": "0.3.10",
+    "ember-cli-qunit": "0.3.15",
+    "ember-cli-release": "0.2.3",
     "ember-cli-sauce": "^1.1.0",
     "ember-cli-uglify": "1.0.1",
-    "ember-data": "1.0.0-beta.16.1",
+    "ember-data": "1.13.5",
     "ember-export-application-global": "^1.0.2",
     "ember-try": "0.0.7"
   }

tests/helpers/start-app.js

@@ -1,6 +1,5 @@
 import Ember from 'ember';
 import Application from '../../app';
-import Router from '../../router';
 import config from '../../config/environment';
 
 export default function startApp(attrs) {