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.rb

Tidier path the member data

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

auto_suggest_helper.rb

Fixed path in auto suggest helper

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

buttons_helper.rb

Update buttons_helper.rb

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

crops_helper.rb

URI.escape -> CGI.escape

2018-12-30 15:39:06 +13:00

gardens_helper.rb

Disabled # rubocop:disable Rails/OutputSafety

2018-12-30 15:38:37 +13:00

harvests_helper.rb

Fixed linter issue, empty line after guard clause

2018-09-13 23:10:43 +12:00

icons_helper.rb

Include font awesome (so specs pass)

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

notifications_helper.rb

Fixed notification url in helper

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

photos_helper.rb

Style fix

2018-04-08 10:04:43 +12:00

plantings_helper.rb

Fixed linter issue, empty line after guard clause

2018-09-13 23:10:43 +12:00

seeds_helper.rb

Revert "Auto corrected by following Style/StringLiterals"

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