Merge branch 'master' into clostridium

* master:
  DS deprecation (rollback)
  Fix up moment js
  Drop brocfile
  ember-cli 1.13.8
  Fix transition deprecation
  Upgrade ember-cli-flash

Brocfile.js

@@ -1,21 +0,0 @@
-/* global require, module */
-
-var EmberApp = require('ember-cli/lib/broccoli/ember-app');
-
-var app = new EmberApp();
-
-// STYLES //////////////////////////////////////////////////////////////////////
-// flakes (and deps)
-app.import('bower_components/flakes/css/all.css');
-app.import('bower_components/gridforms/gridforms/gridforms.css');
-
-// LIBS ////////////////////////////////////////////////////////////////////////
-// flakes (and deps)
-app.import('bower_components/snapjs/snap.js');
-app.import('bower_components/responsive-elements/responsive-elements.js');
-app.import('bower_components/gridforms/gridforms/gridforms.js');
-app.import('bower_components/flakes/js/base.js');
-// moment
-app.import('bower_components/moment/moment.js');
-
-module.exports = app.toTree();

app/helpers/null-time.js

@@ -1,7 +1,9 @@
 import Ember from 'ember';
 import { formatDate } from '../utils/date-helpers';
 
-export default Ember.Handlebars.makeBoundHelper(function(value, format) {
+export default Ember.Helper.helper(function(params) {
+  let value = params[0],
+    format = params[1];
   if (value == null) {
     return 'N/A';
   }

app/pods/login/controller.js

@@ -9,7 +9,7 @@ export default Ember.Controller.extend({
 
       // Manually clean up because there might not be a transition
       this.get('flashMessages').clearMessages();
-      this.transitionTo('loading').then(() => {
+      this.transitionToRoute('loading').then(() => {
         session.authenticate(authenticator, credentials).then(null, (error)=> {
           this.get('flashMessages').error(error.error);
         });

app/pods/protected/species/edit/controller.js

@@ -20,7 +20,7 @@ export default Ember.Controller.extend({
       let species = this.get('model');
 
       species.get('errors').clear();
-      species.rollback();
+      species.rollbackAttributes();
 
       this.transitionToRoute('protected.species.show', species);
     },

app/pods/protected/strains/edit/controller.js

@@ -21,7 +21,7 @@ export default Ember.Controller.extend({
       let strain = this.get('strain');
 
       strain.get('errors').clear();
-      strain.rollback();
+      strain.rollbackAttributes();
 
       this.transitionToRoute('protected.strains.show', strain);
     },

bower.json

@@ -2,19 +2,19 @@
   "name": "clostridiumdotinfo",
   "dependencies": {
     "jquery": "~2.1.1",
-    "ember": "1.13.3",
+    "ember": "1.13.7",
     "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
     "ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
-    "ember-data": "1.13.5",
+    "ember-data": "1.13.8",
     "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5",
-    "ember-qunit": "0.4.1",
+    "ember-qunit": "0.4.9",
     "ember-qunit-notifications": "0.0.7",
     "ember-resolver": "~0.1.18",
-    "loader.js": "ember-cli/loader.js#3.2.0",
-    "qunit": "~1.17.1",
+    "loader.js": "ember-cli/loader.js#3.2.1",
+    "qunit": "~1.18.0",
     "flakes": "~1.0.0",
     "ember-simple-auth": "~0.8.0",
-    "moment": "~2.9.0",
+    "moment": "~2.10.6",
     "select2": "3.5.2",
     "antiscroll": "git://github.com/azirbel/antiscroll.git#90391fb371c7be769bc32e7287c5271981428356",
     "jquery-mousewheel": "~3.1.4",

package.json

@@ -8,8 +8,8 @@
     "test": "tests"
   },
   "scripts": {
-    "start": "ember server",
     "build": "ember build",
+    "start": "ember server",
     "test": "ember test"
   },
   "repository": "",
@@ -19,26 +19,27 @@
   "author": "",
   "license": "MIT",
   "devDependencies": {
-    "broccoli-asset-rev": "^2.0.2",
-    "ember-cli": "1.13.1",
-    "ember-cli-app-version": "0.4.0",
-    "ember-cli-babel": "^5.0.0",
+    "broccoli-asset-rev": "^2.1.2",
+    "ember-cli": "1.13.8",
+    "ember-cli-app-version": "0.5.0",
+    "ember-cli-babel": "^5.1.3",
     "ember-cli-content-security-policy": "0.4.0",
-    "ember-cli-dependency-checker": "^1.0.0",
+    "ember-cli-dependency-checker": "^1.0.1",
     "ember-cli-divshot": "^0.1.7",
-    "ember-cli-flash": "1.1.4",
+    "ember-cli-flash": "1.3.3",
     "ember-cli-htmlbars": "0.7.9",
-    "ember-cli-htmlbars-inline-precompile": "^0.1.1",
+    "ember-cli-htmlbars-inline-precompile": "^0.2.0",
     "ember-cli-ic-ajax": "0.2.1",
-    "ember-cli-inject-live-reload": "^1.3.0",
-    "ember-cli-qunit": "0.3.15",
+    "ember-cli-inject-live-reload": "^1.3.1",
+    "ember-cli-qunit": "^1.0.0",
     "ember-cli-simple-auth": "^0.8.0",
     "ember-cli-simple-auth-token": "^0.7.2",
     "ember-cli-release": "0.2.3",
-    "ember-cli-uglify": "^1.0.1",
-    "ember-data": "1.13.5",
+    "ember-cli-sri": "^1.0.3",
+    "ember-cli-uglify": "^1.2.0",
+    "ember-data": "1.13.8",
     "ember-disable-proxy-controllers": "^1.0.0",
-    "ember-export-application-global": "^1.0.2",
+    "ember-export-application-global": "^1.0.3",
     "ember-select-2": "1.3.0"
   }
 }