Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5

Conflicts:
	Gemfile
	Gemfile.lock
	app/models/crop.rb
	app/models/forum.rb
	app/models/photo.rb
	app/models/planting.rb
	app/models/seed.rb
	db/schema.rb
	spec/models/garden_spec.rb
	spec/models/planting_spec.rb

script/install_codeclimate.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+if [ "${COVERAGE}" = "true" ]; then
+  set -euv
+  curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter;
+  chmod +x ./cc-test-reporter;
+fi

script/install_elasticsearch.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+if [ "${GROWSTUFF_ELASTICSEARCH}" = "true" ]; then
+  set -euv
+  sudo dpkg -r elasticsearch
+  curl -O https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/deb/elasticsearch/2.4.0/elasticsearch-2.4.0.deb
+  sudo dpkg -i --force-confnew elasticsearch-2.4.0.deb
+  sudo service elasticsearch start
+  sleep 10
+  curl -v localhost:9200
+fi

script/install_linters

@@ -1,12 +0,0 @@
-#!/bin/bash
-set -euv
-
-gem install --update overcommit rubocop haml-lint bundler-audit
-npm install
-pip install yamllint --user
-
-overcommit --install
-overcommit --sign
-overcommit --sign pre-commit
-
-bundle-audit update

script/install_linters.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+if [ "${STATIC_CHECKS}" = "true" ]; then
+  set -euv
+  gem install --update overcommit rubocop haml-lint bundler-audit;
+  npm install;
+  pip install yamllint --user;
+
+  overcommit --install;
+  overcommit --sign;
+  overcommit --sign pre-commit;
+
+  bundle-audit update;
+fi