summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhttp://jneen.net/ <jneen@jneen.net>2017-03-10 11:39:54 -0800
committerhttp://jneen.net/ <jneen@jneen.net>2017-03-10 11:39:54 -0800
commit90e11fb272cd30e7e61be16d862830f2b69a624a (patch)
tree7ad728c9d4e9a538c6b38d1dfab49388fd84e03f
parent00cf529a8dfb87dfdb0cc489a69c0043c646b345 (diff)
downloadgitlab-ce-refactor/global-permissions-for-internal-users.tar.gz
allow internal attributes to have a nil valuerefactor/global-permissions-for-internal-users
-rw-r--r--app/models/user.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb
index 1081f103ea6..39c1281179b 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -367,7 +367,7 @@ class User < ActiveRecord::Base
end
def self.non_internal
- where(Hash[internal_attributes.zip([false] * internal_attributes.size)])
+ where(Hash[internal_attributes.zip([[false, nil]] * internal_attributes.size)])
end
#