Brenda Wallace 38e36c4a2c Merge remote-tracking branch 'upstream/dev' into cache/harvests ...

Conflicts:
	.rubocop_todo.yml
	app/controllers/likes_controller.rb
	app/models/concerns/crop_search.rb
	app/services/crop_search_service.rb

2019-12-19 10:28:17 +13:00

..

concerns

Merge remote-tracking branch 'upstream/dev' into cache/harvests

2019-12-19 10:28:17 +13:00

.gitkeep

Moving development to top level directory

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

ability.rb

👩‍🌾 Import openfarm data (#2177)

2019-09-28 17:23:25 +12:00

alternate_name.rb

Pull homepage data directly from elasticsearch (#2316)

2019-12-09 10:03:48 +13:00

application_record.rb

More per page

2019-10-08 15:54:53 +13:00

authentication.rb

Models inherit from application record

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

comment.rb

Merge remote-tracking branch 'upstream/dev' into cache/harvests

2019-12-19 10:28:17 +13:00

crop_companion.rb

👭 Crop companions (#2176)

2019-09-28 10:38:01 +12:00

crop_post.rb

Apply suggestions from code review

2019-09-22 13:22:02 +12:00

crop.rb

Rubocop update (#2334)

2019-12-16 22:35:33 +13:00

csv_importer.rb

Rubocop update (#2334)

2019-12-16 22:35:33 +13:00

follow.rb

Rubocop update (#2334)

2019-12-16 22:35:33 +13:00

forum.rb

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

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

garden_type.rb

don't allow spaces in slug

2019-03-26 22:07:47 +13:00

garden.rb

Rubocop update (#2334)

2019-12-16 22:35:33 +13:00

harvest.rb

Merge remote-tracking branch 'upstream/dev' into cache/harvests

2019-12-19 10:28:17 +13:00

like.rb

Choose crop photos by most liked

2019-07-15 11:58:46 +00:00

member.rb

Rubocop update (#2334)

2019-12-16 22:35:33 +13:00

notification.rb

Split up giant member model

2019-08-12 10:00:21 +12:00

photo_association.rb

Pulling plantings from elastic search too

2019-12-10 13:36:23 +13:00

photo.rb

Merge remote-tracking branch 'upstream/dev' into cache/harvests

2019-12-19 10:28:17 +13:00

plant_part.rb

rubocop lint

2019-08-10 17:30:41 +12:00

planting.rb

Merge remote-tracking branch 'upstream/dev' into cache/harvests

2019-12-19 10:28:17 +13:00

post.rb

Rubocop update (#2334)

2019-12-16 22:35:33 +13:00

role.rb

Rubocop update (#2334)

2019-12-16 22:35:33 +13:00

scientific_name.rb

Pull homepage data directly from elasticsearch (#2316)

2019-12-09 10:03:48 +13:00

seed.rb

Rubocop update (#2334)

2019-12-16 22:35:33 +13:00