Mackenzie ba4d85538c Merge branch 'dev' into scopify

2016-11-30 16:47:22 -05:00

..

controllers

merge from upstream dev

2016-11-29 09:37:25 -05:00

factories

Merge pull request #1088 from maco/rename_scientific_name

2016-11-29 12:04:21 -05:00

features

merge from upstream dev

2016-11-29 09:37:25 -05:00

helpers

Return a string from display_days_before_maturity

2016-11-30 10:16:02 +00:00

lib

Spacing fixes

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

mailers

Removed extra empty blank lines

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

models

update test for renamed scope

2016-11-29 13:41:05 -05:00

requests

implement custom Sweeper class as stop gap against errors when running specs

2014-11-16 12:01:27 +11:00

routing

Removed extra empty blank lines

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

support

Spacing fixes

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

views

merge from upstream dev

2016-11-29 09:37:25 -05:00

custom_matchers.rb

Spacing fixes

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

rails_helper.rb

Spacing fixes

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

spec_helper.rb

Removed extra empty blank lines

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