Merge remote-tracking branch 'upstream/master' into allow-multiple-keywords-in-search

Author: carols10cents

.buildpacks

@@ -1,5 +1,5 @@
 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

.gitignore

@@ -23,4 +23,5 @@ testem.log
 .env
 docker-compose.override.yml
 *~
+src/schema.rs.orig
 

.travis.yml

@@ -11,6 +11,7 @@ cache:
   cargo: true
   directories:
     - $HOME/.npm
+before_cache: script/ci/prune-cache.sh
 
 env:
   global:
@@ -25,10 +26,11 @@ env:
     - PERCY_PROJECT=crates-io/crates.io
 
 install:
+  - 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
@@ -50,27 +52,20 @@ matrix:
     - rust: stable
       before_install:
         - nvm install 10
+        - npm ci
         - rustup component add rustfmt-preview
         - rustup component add clippy-preview
       script:
         - cargo fmt -- --check
-        # TODO: Once clippy:: lint syntax is stable, remove everything after the -- below
-        - cargo clippy --all-targets -- -A renamed_and_removed_lints
-        - cargo build
+        - cargo clippy --all-targets --all-features --all
         - cargo test
-        - npm install
         - npm test
     - rust: beta
       script:
-        - cargo build
         - cargo test
     - rust: nightly
       script:
-        - cargo build
         - cargo test
-      # This portion of the cache is quickly invalidated anyway
-      before_cache:
-        - cargo clean
 
 notifications:
   email: