Merge remote-tracking branch 'upstream/dev' into routes-tidy-up

Conflicts:
	.gitignore

.gitignore

@@ -1,20 +1,30 @@
-/log/*
+.byebug_history
+.bundle
+
+# Folders to ignore
+/log
 /doc
+/tmp
+/vendor
+/coverage
+/public
+/node_modules
+
+# Dev database (if they use sqlite)
 /db/*.sqlite3
-/tmp/*
-coverage
+
+# Editor and file system droppings
 .pt
 .*.sw*
 *~
 *.DS_Store
+.idea/**
+
+# Dev config files
 config/application.yml
 config/database.yml
-credentials*.sh
-Pathogen:
-custom_plan.rb
-zeus.json
-.bundle
-.idea/**
-public/**
-node_modules
-/.byebug_history
+
+# Files that are created on Travis
+cc-test-reporter
+elasticsearch-*.deb
+elasticsearch-*.deb.sha512

.travis.yml

@@ -9,7 +9,7 @@ env:
   matrix:
     - GROWSTUFF_ELASTICSEARCH=true RSPEC_TAG=elasticsearch COVERAGE=true
     - GROWSTUFF_ELASTICSEARCH=false RSPEC_TAG=~elasticsearch COVERAGE=false
-    # - STATIC_CHECKS=true
+    - STATIC_CHECKS=true
   global:
     - secure: "Z5TpM2jEX4UCvNePnk/LwltQX48U2u9BRc+Iypr1x9QW2o228QJhPIOH39a8RMUrepGnkQIq9q3ZRUn98RfrJz1yThtlNFL3NmzdQ57gKgjGwfpa0e4Dwj/ZJqV2D84tDGjvdVYLP7zzaYZxQcwk/cgNpzKf/jq97HLNP7CYuf4="
     - GROWSTUFF_EMAIL="noreply@test.growstuff.org"
@@ -19,7 +19,7 @@ before_install:
   - ./script/install_phantomjs.sh
   - export PATH=$PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH
   - ./script/install_codeclimate.sh
-  # - ./script/install_linters.sh
+  - ./script/install_linters.sh
   - VERSION="6.2.3" ./script/install_elasticsearch.sh
 before_script:
   - >

script/install_linters.sh

@@ -2,11 +2,11 @@
 
 if [ "${STATIC_CHECKS}" = "true" ]; then
   set -euv
-  npm install;
+  yarn install;
 
-  gem install --update overcommit haml-lint bundler-audit;
+  gem install --update overcommit haml-lint bundler-audit --no-document;
 
-  pip install --upgrade pip;
+  # pip install --upgrade pip;
   pip install yamllint --user;
 
   overcommit --install;