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

..

concerns

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

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

.gitkeep

Moving development to top level directory

2012-08-23 10:41:00 -07:00

ability.rb

Ancestry of food. Seeds -> Planting -> Seeds -> Planting (#1550)

2018-03-12 08:39:32 +13:00

alternate_name.rb

Revert "Auto corrected by following Style/StringLiterals"

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

application_record.rb

Models inherit from application record

2018-01-03 17:16:14 +13:00

authentication.rb

Models inherit from application record

2018-01-03 17:16:14 +13:00

comment.rb

Revert "Auto corrected by following Style/StringLiterals"

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

crop.rb

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

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

csv_importer.rb

Style fixes after rubocop upgrade

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

follow.rb

Revert "Auto corrected by following Style/StringLiterals"

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

forum.rb

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

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

garden.rb

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

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

harvest.rb

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

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

like.rb

Models inherit from application record

2018-01-03 17:16:14 +13:00

member.rb

More dependent declared on relationships

2018-04-02 16:12:40 +12:00

notification.rb

Revert "Auto corrected by following Style/StringLiterals"

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

photo.rb

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

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

photographing.rb

Models inherit from application record

2018-01-03 17:16:14 +13:00

plant_part.rb

More dependent declared on relationships

2018-04-02 16:12:40 +12:00

planting.rb

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

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

post.rb

belongs_to defaults to required. setting some to optional

2018-01-04 14:55:36 +13:00

role.rb

Models inherit from application record

2018-01-03 17:16:14 +13:00

scientific_name.rb

Revert "Auto corrected by following Style/StringLiterals"

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

seed.rb

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

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