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

Author: carols10cents

.buildpacks

@@ -1,5 +1,4 @@
-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
+https://github.com/heroku/heroku-buildpack-nginx.git#fbc49cd
 https://github.com/sgrif/heroku-buildpack-diesel#f605edd

.diesel_version

@@ -1 +1 @@
-1.3.0
+1.4.0

.eslintignore

@@ -0,0 +1,20 @@
+# unconventional js
+/blueprints/*/files/
+/vendor/
+
+# compiled output
+/dist/
+/tmp/
+
+# dependencies
+/bower_components/
+/node_modules/
+
+# misc
+/coverage/
+!.*
+
+# ember-try
+/.node_modules.ember-try/
+/bower.json.ember-try
+/package.json.ember-try

.eslintrc.js

@@ -25,7 +25,16 @@ module.exports = {
     overrides: [
         // node files
         {
-            files: ['testem.js', 'ember-cli-build.js', 'config/**/*.js', 'lib/*/index.js'],
+            files: [
+                '.eslintrc.js',
+                '.template-lintrc.js',
+                'ember-cli-build.js',
+                'testem.js',
+                'blueprints/*/index.js',
+                'config/**/*.js',
+                'lib/*/index.js',
+                'server/**/*.js',
+            ],
             parserOptions: {
                 sourceType: 'script',
                 ecmaVersion: 2015,

.gitignore

@@ -11,6 +11,7 @@
 /bower_components
 
 # misc
+/.eslintcache
 /.sass-cache
 /connect.lock
 /coverage/*

.travis.yml

@@ -1,6 +1,6 @@
 language: rust
 sudo: required
-dist: trusty
+dist: xenial
 
 # Ignore this branch per bors-ng documentation
 branches:
@@ -24,41 +24,48 @@ env:
     # on community-submitted PRs
     - PERCY_TOKEN=0d8707a02b19aebbec79bb0bf302b8d2fa95edb33169cfe41b084289596670b1
     - PERCY_PROJECT=crates-io/crates.io
+    - PGPORT=5433
 
 install:
+  - sudo cp /etc/postgresql/10/main/pg_hba.conf /etc/postgresql/11/main/pg_hba.conf
+  - sudo systemctl restart postgresql@11-main
   - script/ci/cargo-clean-on-new-rustc-version.sh
   - 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
+  - diesel database setup --locked-schema
 
 addons:
   chrome: stable
-  postgresql: "9.5"
+  postgresql: "11"
   apt:
-    sources:
-      - kalakris-cmake
     packages:
-      - cmake
-      - libcurl4-openssl-dev
-      - libelf-dev
-      - libdw-dev
+      - postgresql-11
+      - postgresql-client-11
 
 matrix:
   fast_finish: true
   allow_failures:
     - rust: nightly
   include:
-    - rust: stable
+    - name: Backend
+      rust: stable
       before_install:
-        - nvm install 10
-        - npm ci
         - rustup component add rustfmt-preview
         - rustup component add clippy-preview
       script:
         - cargo fmt -- --check
         - cargo clippy --all-targets --all-features --all
         - cargo test
+    - name: Frontend
+      language: node_js
+      node_js: 10
+      install:
+        - npm ci
+      before_script: skip
+      script:
+        - npm run lint:js
+        - npm run lint:deps
         - npm test
     - rust: beta
       script: