Merge branch '43304-simplify-filtering-non-human-users' into 'master'

Simplify filtering of non-human users. Closes #43304 See merge request gitlab-org/gitlab-ce!17288

Merge branch '43304-simplify-filtering-non-human-users' into 'master'
6c404813 · Yorick Peterse · b3c0253c · df55efda · 6c404813
Commit 6c404813 authored Feb 27, 2018 by Yorick Peterse
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

user.rb app/models/user.rb +1 -1

No files found.
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -431,7 +431,7 @@ class User < ActiveRecord::Base
  end

  def self.non_internal
-    where(Hash[internal_attributes.zip([[false, nil]] * internal_attributes.size)])
+    where(internal_attributes.map { |attr| "#{attr} IS NOT TRUE" }.join(" AND "))
  end

  #