Merge branch 'remove-user-query-deplications' into 'master'

DRY User scopes for bots/humans

See merge request gitlab-org/gitlab!22976

ee/app/models/ee/user.rb

@@ -125,12 +125,12 @@ module EE
 
       override :internal
       def internal
-        super.or(where.not(bot_type: nil))
+        super.or(bots)
       end
 
       override :non_internal
       def non_internal
-        super.where(bot_type: nil)
+        super.humans
       end
 
       def non_ldap