Brenda Wallace ff50ec65d0 Merge remote-tracking branch 'upstream/dev' into HEAD

2017-01-22 18:26:29 +13:00

..

controller_macros.rb

…

database_cleaner.rb

…

devise.rb

…

elasticsearch_helpers.rb

Use guard clauses

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

feature_helpers.rb

…

is_likeable.rb

…