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

Updated spec for new admin#index

2017-12-17 17:54:13 +13:00

comments

changed spec to expect responder gem flash

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

crops

Merge branch 'charts' into upgrade/rails-5

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

gardens

Fix gardens actions, and add specs

2017-11-19 16:31:17 +13:00

harvests

More DRY Harvests controller

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

members

Auto corrected by following RSpec/EmptyLineAfterFinalLet

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

photos

Whitespace fix, spec fix, and spec addition

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

places

Removed extra blank lines, & added a end of file

2016-11-16 12:52:48 +13:00

plantings

Auto corrected by following RSpec/EmptyLineAfterFinalLet

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

posts

Issue #476 test update

2016-06-02 14:58:10 +00:00

rss

Spacing fixes

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

seeds

Auto corrected by following RSpec/EmptyLineAfterFinalLet

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

shared_examples

Fix up all UnneededInterpolation

2017-02-16 12:26:47 +13:00

cms_spec.rb

fixed up ambigous regex and use of expect in specs

2017-10-23 10:44:37 +01:00

following_spec.rb

Fix up all UnneededInterpolation

2017-02-16 12:26:47 +13:00

footer_spec.rb

Removed extra empty blank lines

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

gardens_spec.rb

Auto corrected by following RSpec/EmptyLineAfterFinalLet

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

likeable_spec.rb

Factorygirl to factorybot - fixes #1413 (#1425)

2017-11-01 15:03:31 +00:00

locale_spec.rb

Removed extra empty blank lines

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

member_profile_spec.rb

Removed extra empty blank lines

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

members_list_spec.rb

Removed extra blank lines, & added a end of file

2016-11-16 12:52:48 +13:00

notifications_spec.rb

Unique member name on notifications spec

2018-01-07 22:10:27 +13:00

planting_reminder_spec.rb

Removed all trailing white space

2016-11-14 15:05:32 +13:00

scientific_name_spec.rb

Dry the scientific names controller

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

signin_spec.rb

Fixed up % delimiters

2017-12-06 14:14:31 +13:00

signout_spec.rb

Auto corrected by following RSpec/EmptyLineAfterFinalLet

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

signup_spec.rb

Removed extra empty blank lines

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

unsubscribing_spec.rb

removed member look up that wasn't used in spec

2016-12-01 12:50:16 +13:00