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

..

admin

Use bang! to indicate method can explode

2019-10-21 14:43:46 +13:00

api/v1

all our api controllers inheriting from base

2017-11-13 19:19:18 +13:00

charts

👩‍🌾 Import openfarm data (#2177)

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

admin_controller.rb

Fixed admin typo

2017-05-29 17:52:08 +12:00

alternate_names_controller.rb

Remove controller actions for method that don't exist

2018-12-30 15:32:59 +13:00

application_controller.rb

Rubocop update (#2334)

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

authentications_controller.rb

Rubocop update (#2334)

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

comments_controller.rb

Rubocop update (#2334)

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

conversations_controller.rb

Rubocop update (#2334)

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

crops_controller.rb

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

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

follows_controller.rb

Allow anyone to view followers - and tidy up display

2019-08-31 14:25:31 +12:00

forums_controller.rb

Add flash messages to controllers

2019-07-09 09:19:27 +12:00

garden_types_controller.rb

Rename containers to garden types

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

gardens_controller.rb

Rubocop update (#2334)

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

harvests_controller.rb

Rubocop update (#2334)

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

home_controller.rb

DRY the homes controller

2017-05-29 16:17:43 +12:00

likes_controller.rb

Rubocop update (#2334)

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

members_controller.rb

Rubocop update (#2334)

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

messages_controller.rb

Fixed double negative

2019-07-21 19:22:25 +12:00

omniauth_callbacks_controller.rb

Revert "Auto corrected by following Style/StringLiterals"

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

pages_controller.rb

Revert "Auto corrected by following Style/StringLiterals"

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

passwords_controller.rb

Rubocop style fix ups

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

photo_associations_controller.rb

Renaming photographings to photo associations

2019-07-13 16:13:37 +12:00

photos_controller.rb

Rubocop update (#2334)

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

places_controller.rb

Places params is :place

2019-01-06 08:45:42 +13:00

plant_parts_controller.rb

Fix sort on plant parts

2017-11-29 20:59:37 +13:00

plantings_controller.rb

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

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

posts_controller.rb

Remove comments

2019-10-19 09:44:05 +13:00

registrations_controller.rb

Fix member discarding to match specs

2019-08-10 15:43:06 +12:00

robots_controller.rb

Style fixes after rubocop upgrade

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

scientific_names_controller.rb

Rubocop upgrade (and some style fixes)

2017-12-01 21:07:39 +13:00

seeds_controller.rb

linking existing plantings to their parent seeds

2019-11-01 02:23:14 +00:00

sessions_controller.rb

👩‍🌾 Import openfarm data (#2177)

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

timeline_controller.rb

Timeline

2019-07-07 22:03:15 +12:00