Update ember version

.eslintignore

@@ -8,9 +8,13 @@
 
 # dependencies
 /bower_components/
+/node_modules/
 
 # misc
 /coverage/
+!.*
 
 # ember-try
 /.node_modules.ember-try/
+/bower.json.ember-try
+/package.json.ember-try

.eslintrc.js

@@ -21,11 +21,14 @@ module.exports = {
     // node files
     {
       files: [
+        '.eslintrc.js',
+        '.template-lintrc.js',
         'ember-cli-build.js',
         'testem.js',
         'blueprints/*/index.js',
         'config/**/*.js',
-        'lib/*/index.js'
+        'lib/*/index.js',
+        'server/**/*.js'
       ],
       parserOptions: {
         sourceType: 'script',
@@ -34,7 +37,15 @@ module.exports = {
       env: {
         browser: false,
         node: true
-      }
+      },
+      plugins: ['node'],
+      rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
+        // add your custom rules and overrides for node files here
+
+        // this can be removed once the following is fixed
+        // https://github.com/mysticatea/eslint-plugin-node/issues/77
+        'node/no-unpublished-require': 'off'
+      })
     }
   ]
 };

.gitignore

@@ -12,6 +12,8 @@
 /node_modules/
 
 # misc
+/.env*
+/.pnp*
 /.sass-cache
 /connect.lock
 /coverage/

.template-lintrc.js

@@ -0,0 +1,9 @@
+'use strict';
+
+module.exports = {
+  extends: 'recommended',
+  rules: {
+    "attribute-indentation": false,
+    "block-indentation": false
+  }
+};

.travis.yml

@@ -25,5 +25,11 @@ install:
   - yarn install --non-interactive
 
 script:
+<<<<<<< HEAD
   - yarn lint:js
   - yarn test
+=======
+  - npm run lint:hbs
+  - npm run lint:js
+  - npm test
+>>>>>>> 8512e1e... message

app/adapters/application.js

@@ -12,7 +12,7 @@ export default DS.JSONAPIAdapter.extend(DataAdapterMixin, {
   },
   host: env.apiHost,
   namespace: 'api',
-  pathForType: function (type) {
+  pathForType: function () {
     const original = this._super(...arguments)
     return underscore(original)
   },
@@ -44,10 +44,10 @@ export default DS.JSONAPIAdapter.extend(DataAdapterMixin, {
     }
   },
   actions: {
-    error (e, transition) {
+    error (e) {
       if(e && e.status === 401) {
         this.get('session').invalidate()
       }
     }
   }
-})
+})

app/pods/callback/route.js

@@ -9,7 +9,7 @@ export default Route.extend({
       return ;
     }
 
-    return this.get('session').authenticate('authenticator:custom', transition.queryParams.code)
+    return this.get('session').authenticate('authenticator:custom', transition.to.queryParams.code)
       .then(() => this.get('currentUser').load())
   },
   afterModel () {

app/pods/questions/index/controller.js

@@ -9,8 +9,6 @@ export default Controller.extend({
   searchTask: task(function * () {
     yield timeout(250)
 
-    let searchStr = this.get('searchString').trim()
-
     const questions = yield this.get('store').query('question', {
       include: 'user',
       filter: {

app/pods/quiz/index/controller.js

@@ -6,8 +6,6 @@ export default Controller.extend({
   searchTask: task(function * () {
     yield timeout(250)
 
-    let searchStr = this.get('searchString').trim()
-
     const quizzes = yield this.get('store').query('quiz', {
       filter: {
         title: {

app/services/current-user.js

@@ -18,9 +18,7 @@ export default Service.extend({
           this.set('user', data)
           this.get('router').transitionTo('err', 'ADMIN_ONLY')
         }
-      }).catch(err => {
-        this.get('session').invalidate()
       })
     }
   }
-})
+})

config/environment.js

@@ -14,7 +14,7 @@ module.exports = function(environment) {
     EmberENV: {
       FEATURES: {
         // Here you can enable experimental features on an ember canary build
-        // e.g. 'with-controller': true
+        // e.g. EMBER_NATIVE_DECORATOR_SUPPORT: true
       },
       EXTEND_PROTOTYPES: {
         // Prevent Ember Data from overriding Date.parse.

config/optional-features.json

@@ -0,0 +1,3 @@
+{
+  "jquery-integration": true
+}