Brenda Wallace 986bca44f7 Merge remote-tracking branch 'upstream/dev' into routes-tidy-up ...

Conflicts:
	app/views/layouts/_header.html.haml
	spec/features/gardens/actions_spec.rb

2019-01-24 13:48:36 +13:00

..

application_helper_spec.rb

Auto corrected by following Ruby rspec layout

2018-09-10 22:20:12 +00:00

buttons_helper_spec.rb

Tests for edit and add photo buttons

2019-01-24 12:17:40 +13:00

crops_helper_spec.rb

Revert "Auto corrected by following Style/StringLiterals"

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

gardens_helper_spec.rb

Revert "Auto corrected by following Style/StringLiterals"

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

harvests_helper_spec.rb

Align all the hashes

2018-12-30 15:22:29 +13:00

notifications_helper_spec.rb

Update notification reply url in helper spec

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

photos_helper_spec.rb

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

2018-09-11 16:07:30 +12:00

plantings_helper_spec.rb

Align all the hashes

2018-12-30 15:22:29 +13:00

seeds_helper_spec.rb

Revert "Auto corrected by following Style/StringLiterals"

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