Merge remote-tracking branch 'upstream/master' into bump_some_deps

Author: carols10cents

.buildpacks

@@ -1,4 +1,4 @@
-https://github.com/Starkast/heroku-buildpack-cmake#1c0610dbdfc
+https://github.com/Starkast/heroku-buildpack-cmake#a243c67
 https://github.com/emk/heroku-buildpack-rust#578d630
 https://codon-buildpacks.s3.amazonaws.com/buildpacks/heroku/emberjs.tgz
 https://github.com/travis-ci/nginx-buildpack.git#2fbde35

.diesel_version

@@ -1 +1 @@
-1.2.0
+1.3.0

.eslintrc.js

@@ -4,41 +4,28 @@ module.exports = {
         ecmaVersion: 2017,
         sourceType: 'module',
         ecmaFeatures: {
-            'experimentalObjectRestSpread': true,
+            experimentalObjectRestSpread: true,
         },
     },
-    plugins: [
-        'ember',
-    ],
-    extends: [
-        'eslint:recommended',
-        'plugin:ember/recommended',
-    ],
+    plugins: ['ember', 'prettier'],
+    extends: ['eslint:recommended', 'plugin:ember/recommended', 'plugin:prettier/recommended'],
     env: {
         browser: true,
     },
     rules: {
+        'prettier/prettier': 'error',
+
         'arrow-parens': 'off',
         'brace-style': 'off',
-        'camelcase': 'off',
+        camelcase: 'off',
         'comma-dangle': 'off',
         'dot-notation': 'off',
-        'indent': ['error', 4],
         'operator-linebreak': 'off',
-        'quotes': ['error', 'single', {
-            'allowTemplateLiterals': true,
-            'avoidEscape': true,
-        }],
     },
     overrides: [
         // node files
         {
-            files: [
-                'testem.js',
-                'ember-cli-build.js',
-                'config/**/*.js',
-                'lib/*/index.js',
-            ],
+            files: ['testem.js', 'ember-cli-build.js', 'config/**/*.js', 'lib/*/index.js'],
             parserOptions: {
                 sourceType: 'script',
                 ecmaVersion: 2015,

.travis.yml

@@ -24,10 +24,10 @@ env:
     - PERCY_PROJECT=crates-io/crates.io
 
 before_install:
-  - nvm install 8
+  - nvm install 10
 
 install:
-  - cargo install --force diesel_cli --vers 1.2.0 --no-default-features --features postgres && export PATH=$HOME/.cargo/bin:$PATH
+  - cargo install --force diesel_cli --vers `cat .diesel_version` --no-default-features --features postgres && export PATH=$HOME/.cargo/bin:$PATH
 
 before_script:
   - diesel database setup