Merge remote-tracking branch 'origin/master' into gs-master

2017-11-16 22:52:37 -06:00
parent ee560abdbe dc6e031364
commit b28b405b97
29 changed files with 136 additions and 72 deletions
--- a/app/models/concerns/account_finder_concern.rb
+++ b/app/models/concerns/account_finder_concern.rb
@@ -44,7 +44,7 @@ module AccountFinderConcern
    end

    def with_usernames
-      Account.where.not(username: [nil, ''])
+      Account.where.not(username: '')
    end

    def matching_username