Brenda Wallace 8047aef692 Merge remote-tracking branch 'upstream/dev' into bw/descriptive-spec ...

Conflicts:
	spec/features/signin_spec.rb

2017-01-03 22:16:24 +13:00

..

controllers

Removed redundant returns

2016-12-04 21:21:35 +00:00

factories

Fixed AmbiguousOperator

2016-12-06 21:09:39 +13:00

features

Merge remote-tracking branch 'upstream/dev' into bw/descriptive-spec

2017-01-03 22:16:24 +13:00

helpers

Merge branch 'dev' into bw/useless-assignments

2016-12-01 12:51:13 +13:00

lib

Use guard clauses

2016-12-14 21:28:35 +00:00

mailers

Removed extra empty blank lines

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

models

Test Model.newsletter_(un)subscribe

2016-12-19 22:15:53 +00: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

Use guard clauses

2016-12-14 21:28:35 +00:00

views

Fixed parentheses that are interp-ed as grouped expression

2016-12-06 21:23:55 +13: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

Upgrade

2016-12-09 11:25:03 +10:30