Brenda Wallace f8a404a88b 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

2018-04-28 21:25:06 +12:00

..

check_contributors_md.rb

Auto corrected by following EmptyLine

2018-01-23 09:00:34 +13:00

check_static.rb

renamed ruby files to .rb

2017-03-02 21:13:35 +13:00

deploy-tasks.sh

Precompile css and js with sass

2016-05-22 16:34:36 +00:00

heroku_maintenance.rb

Revert "Auto corrected by following Style/StringLiterals"

2018-02-09 07:58:47 +13:00

install_codeclimate.sh

Clean up errors on undefined shell vars

2018-03-20 11:06:37 +13:00

install_elasticsearch.sh

Can't rename GROWSTUFF_ELASTICSEARCH

2018-03-20 11:35:01 +13:00

install_linters.sh

Clean up errors on undefined shell vars

2018-03-20 11:06:37 +13:00

install_phantomjs.sh

Merge branch 'dev' into fix/coverage

2018-03-19 17:47:01 +13:00

rails

Revert "Auto corrected by following Style/ExpandPathArguments"

2018-04-21 10:35:28 +12:00