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

..

environments

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

2018-04-02 10:59:13 +12:00

initializers

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

2018-04-02 10:59:13 +12:00

locales

Merge branch 'dev' into feature/i18n

2018-04-26 17:26:55 +12:00

application.rb

Revert "Auto corrected by following Style/ExpandPathArguments"

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

application.yml.example

Removed active merchant

2018-02-09 10:53:05 +13:00

boot.rb

Revert "Auto corrected by following Style/ExpandPathArguments"

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

cable.yml

Updated code for Rail 5

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

compass.rb

Fixed all useless assignments

2016-11-26 19:36:59 +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

Removed all trailing white space

2016-11-14 15:05:32 +13:00

puma.rb

Updated code for Rail 5

2018-01-03 17:12:17 +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

Comment out comfy admin for now

2018-04-02 11:20:28 +12: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

unicorn.rb

Underscore prefix on our last unused args (#1442)

2017-11-13 09:54:55 +00:00