Brenda Wallace 8e0b7d9ded Merge branch 'charts' into upgrade/rails-5 ...

Conflicts:
	app/assets/javascripts/crops.js.erb
	spec/controllers/comments_controller_spec.rb
	spec/controllers/harvests_controller_spec.rb
	spec/controllers/photos_controller_spec.rb
	spec/controllers/plantings_controller_spec.rb
	spec/models/post_spec.rb
	spec/views/home/_crops.html.haml_spec.rb

2018-01-11 08:34:20 +13:00

..

admin

Http positional arguments in rails 5

2018-01-04 21:28:48 +13:00

account_types_controller_spec.rb

Auto corrected by following RSpec/EmptyLineAfterFinalLet

2018-01-09 02:00:40 +00:00

accounts_controller_spec.rb

De-deprecate controller and view specs

2017-11-17 16:51:24 +00:00

admin_controller_spec.rb

Http positional arguments in rails 5

2018-01-04 21:28:48 +13:00

authentications_controller_spec.rb

De-deprecate controller and view specs

2017-11-17 16:51:24 +00:00

comments_controller_spec.rb

Merge branch 'charts' into upgrade/rails-5

2018-01-11 08:34:20 +13:00

crops_controller_spec.rb

Crops controller spec, use let, other cleanup

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

forums_controller_spec.rb

De-deprecate controller and view specs

2017-11-17 16:51:24 +00:00

gardens_controller_spec.rb

Merge branch 'charts' into upgrade/rails-5

2018-01-11 08:34:20 +13:00

harvests_controller_spec.rb

Merge branch 'charts' into upgrade/rails-5

2018-01-11 08:34:20 +13:00

home_controller_spec.rb

De-deprecate controller and view specs

2017-11-17 16:51:24 +00:00

likes_controller_spec.rb

Merge branch 'charts' into upgrade/rails-5

2018-01-11 08:34:20 +13:00

member_controller_spec.rb

Http positional arguments in rails 5

2018-01-04 21:28:48 +13:00

notifications_controller_spec.rb

Http positional arguments in rails 5

2018-01-04 21:28:48 +13:00

order_items_controller_spec.rb

Http positional arguments in rails 5

2018-01-04 21:28:48 +13:00

orders_controller_spec.rb

Http positional arguments in rails 5

2018-01-04 21:28:48 +13:00

photo_associations_controller_spec.rb

Merge branch 'charts' into upgrade/rails-5

2018-01-11 08:34:20 +13:00

photos_controller_spec.rb

Merge branch 'charts' into upgrade/rails-5

2018-01-11 08:34:20 +13:00

places_controller_spec.rb

Http positional arguments in rails 5

2018-01-04 21:28:48 +13:00

plant_parts_controller_spec.rb

De-deprecate controller and view specs

2017-11-17 16:51:24 +00:00

plantings_controller_spec.rb

Auto corrected by following RSpec/EmptyLineAfterFinalLet

2018-01-09 02:00:40 +00:00

posts_controller_spec.rb

Fixed a matcher in posts controller spec

2018-01-06 08:54:44 +13:00

products_controller_spec.rb

De-deprecate controller and view specs

2017-11-17 16:51:24 +00:00

registrations_controller_spec.rb

De-deprecate controller and view specs

2017-11-17 16:51:24 +00:00

robots_controller_spec.rb

Spacing fixes

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

roles_controller_spec.rb

Http positional arguments in rails 5

2018-01-04 21:28:48 +13:00

scientific_names_controller_spec.rb

Http positional arguments in rails 5

2018-01-04 21:28:48 +13:00

seeds_controller_spec.rb

Http positional arguments in rails 5

2018-01-04 21:28:48 +13:00

shop_controller_spec.rb

Merge branch 'charts' into upgrade/rails-5

2018-01-11 08:34:20 +13:00