Brenda Wallace f5f5ecdea7 Merge remote-tracking branch 'upstream/dev' into material-merge ...

Conflicts:
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.sass
	app/assets/stylesheets/plantings.sass
	app/views/crops/_thumbnail.html.haml
	app/views/crops/show.html.haml
	app/views/home/_members.html.haml
	app/views/layouts/application.html.haml
	app/views/photos/show.html.haml
	app/views/plantings/_descendants.html.haml
	app/views/plantings/show.html.haml
	app/views/seeds/_thumbnail.html.haml
	app/views/shared/_global_actions.html.haml
	spec/models/crop_spec.rb

2019-04-21 11:27:27 +12:00

..

environments

Merge remote-tracking branch 'upstream/dev' into material-merge

2019-04-21 11:27:27 +12:00

initializers

Merge branch 'dev' into upgrade/rails-5-2

2019-01-03 12:31:37 +13:00

locales

Update translations

2019-03-26 21:10:40 +13:00

application.rb

More locations with production email addresses

2019-01-01 13:56:08 +13:00

application.yml.example

Added growstuff prefix to env variables

2019-03-26 15:57:29 +13:00

boot.rb

Upgrade to Rails 5.2

2019-01-01 10:31:53 +13:00

cable.yml

Upgrade to Rails 5.2

2019-01-01 10:31:53 +13:00

compass.rb

Re-enable rubocop cops

2018-12-30 15:17:22 +13:00

database.yml

Wrapped all long lines.

2016-11-17 22:02:18 +13:00

database.yml.example

Making database.yml locally editable

2016-05-22 15:50:22 +00:00

environment.rb

Revert "Auto corrected by following Style/ExpandPathArguments"

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

factory_bot.rb

Factorygirl to factorybot - fixes #1413 (#1425)

2017-11-01 15:03:31 +00:00

i18n-tasks.yml

don't scope routes to locale to make url prettier because it breaks tests like whoa

2014-09-18 07:14:35 +10:00

newrelic.yml

set newrelic to use ssl

2019-01-23 13:57:32 +13:00

puma.rb

Upgrade to Rails 5.2

2019-01-01 10:31:53 +13:00

robots.staging.txt

Change the render to render the file directly

2015-05-04 23:37:40 -07:00

robots.txt

Change the render to render the file directly

2015-05-04 23:37:40 -07:00

routes.rb

Rename containers to garden types

2019-03-26 20:56:11 +13:00

secrets.yml

Set staging secret key from environment

2015-07-09 00:47:11 +01:00

setup_load_paths.rb

Style fixes after rubocop upgrade

2018-04-02 15:48:16 +12:00

sidekiq.yml

Add sidekiq configuration

2016-08-16 11:02:35 +09:30

spring.rb

Updated code for Rail 5

2018-01-03 17:12:17 +13:00

storage.yml

Upgrade to Rails 5.2

2019-01-01 10:31:53 +13:00

unicorn.rb

Rubocop style fix ups

2018-06-04 16:18:49 +12:00