Brenda Wallace d9bdc46099 Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5 ...

Conflicts:
	app/assets/javascripts/members.js.erb

2018-01-21 21:20:43 +13:00

..

controllers

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

2018-01-21 21:20:43 +13:00

factories

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

2018-01-21 21:20:43 +13:00

features

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

2018-01-21 21:20:43 +13:00

helpers

Updated code for Rail 5

2018-01-03 17:12:17 +13:00

javascripts

Removed d3 graph tests

2018-01-11 09:31:59 +13:00

lib

Updated code for Rail 5

2018-01-03 17:12:17 +13:00

mailers

Factorygirl to factorybot - fixes #1413 (#1425)

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

models

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

2018-01-21 21:20:43 +13:00

requests

Fixed api request specs after rails 5 upgrade

2018-01-06 12:19:42 +13:00

routing

Removed extra empty blank lines

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

support

use bare percent literals

2017-12-06 14:33:51 +13:00

views

Merge branch 'charts' into upgrade/rails-5

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

custom_matchers.rb

Spacing fixes

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

rails_helper.rb

change string replacement for performance reasons

2017-12-06 15:19:34 +13:00

spec_helper.rb

Rubocop upgrade (and some style fixes)

2017-12-01 21:07:39 +13:00