Brenda Wallace 5e0cff5b8e Merge remote-tracking branch 'upstream/dev' into bw/covert-tabs-to-spaces ...

Conflicts:
	app/helpers/seeds_helper.rb
	spec/support/controller_macros.rb

2016-11-17 19:04:44 +13:00

..

controller_macros.rb

Merge remote-tracking branch 'upstream/dev' into bw/covert-tabs-to-spaces

2016-11-17 19:04:44 +13:00

database_cleaner.rb

Removed extra blank lines, & added a end of file

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

devise.rb

Upgrade devise to 4.2

2016-08-15 22:12:34 +09:30

elasticsearch_helpers.rb

Fix changes in spec/support

2015-07-09 01:59:34 +08:00

feature_helpers.rb

Removed extra blank lines, & added a end of file

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