Brenda Wallace 14551b6ec8 Merge remote-tracking branch 'upstream/dev' into feature/photos-1457 ...

Conflicts:
	spec/models/crop_spec.rb

2017-12-09 20:59:20 +13:00

..

admin

Removed unnecesary braces on hash args

2017-01-22 15:10:11 +13:00

api/v1

all our api controllers inheriting from base

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

account_types_controller.rb

Add ordering back into controller #index

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

accounts_controller.rb

Add ordering back into controller #index

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

admin_controller.rb

Fixed admin typo

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

alternate_names_controller.rb

Rubocop upgrade (and some style fixes)

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

application_controller.rb

Deleting of users

2017-05-21 21:29:09 +12:00

authentications_controller.rb

Fix up to match rubocop's MultilineMethodCallBraceLayout recommendation

2017-02-19 16:17:03 +13:00

comments_controller.rb

Rubocop upgrade (and some style fixes)

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

crops_controller.rb

Merge branch 'dev' into ordering

2017-12-08 20:20:27 +13:00

follows_controller.rb

before_filter is now before_action

2016-11-26 17:20:13 +13:00

forums_controller.rb

Add ordering back into controller #index

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

gardens_controller.rb

Rubocop upgrade (and some style fixes)

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

harvests_controller.rb

Fixed ordering of Harvests - don't order in scope.

2017-11-05 17:42:59 +13:00

home_controller.rb

DRY the homes controller

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

likes_controller.rb

Reduced repeating code in likes controller

2017-02-14 11:52:20 +13:00

members_controller.rb

Rubocop upgrade (and some style fixes)

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

notifications_controller.rb

Add ordering back into controller #index

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

omniauth_callbacks_controller.rb

Fixed last old style word array

2017-12-06 14:18:51 +13:00

order_items_controller.rb

Fix up duplicate order item in controller spec, and DRY

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

orders_controller.rb

ParenthesesAroundCondition fixup

2017-02-19 16:20:45 +13:00

pages_controller.rb

hotfix commit: letsencrypt try #2

2016-06-20 13:40:49 -04:00

passwords_controller.rb

Removed extra empty blank lines

2016-11-26 12:06:02 +13:00

photo_associations_controller.rb

Moved photo.items's item lookup to a class method

2017-11-30 11:23:34 +13:00

photos_controller.rb

Merge remote-tracking branch 'upstream/dev' into feature/photos-1457

2017-12-09 20:59:20 +13:00

places_controller.rb

Rubocop upgrade (and some style fixes)

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

plant_parts_controller.rb

Fix sort on plant parts

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

plantings_controller.rb

Plantings controller ordering and specs

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

posts_controller.rb

Rubocop upgrade (and some style fixes)

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

products_controller.rb

Add ordering back into controller #index

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

registrations_controller.rb

Doesn't need check the :deleted field in registraions

2017-06-02 22:40:39 +12:00

robots_controller.rb

Fixes for two calls to deprecated methods

2016-11-30 10:25:23 +13:00

roles_controller.rb

Add ordering back into controller #index

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

scientific_names_controller.rb

Rubocop upgrade (and some style fixes)

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

seeds_controller.rb

Rubocop upgrade (and some style fixes)

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

sessions_controller.rb

Underscore prefix on our last unused args (#1442)

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

shop_controller.rb

Use a guard clasue in shop controller

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