summaryrefslogtreecommitdiff
path: root/app/models/concerns
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-04-01 01:01:38 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-04-01 01:01:38 +0000
commitdc3b4321ff6ed08b41a9155b85b12df0145df077 (patch)
treed2d99f1acd69de085c77df00302ba44954042d81 /app/models/concerns
parent0622b875370469c3596eb4cea200dc507fc01a30 (diff)
parenta4608a8dbce1ba5b4c07a51f88d6a5fa60728dca (diff)
downloadgitlab-ce-dc3b4321ff6ed08b41a9155b85b12df0145df077.tar.gz
Merge branch 'group-information-leak' into 'master'
Don't leak private group existence by redirecting from namespace controller to group controller. See merge request !440
Diffstat (limited to 'app/models/concerns')
-rw-r--r--app/models/concerns/mentionable.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/concerns/mentionable.rb b/app/models/concerns/mentionable.rb
index 74900d4675d..d96e07034ec 100644
--- a/app/models/concerns/mentionable.rb
+++ b/app/models/concerns/mentionable.rb
@@ -52,7 +52,7 @@ module Mentionable
if identifier == "all"
users.push(*project.team.members.flatten)
elsif namespace = Namespace.find_by(path: identifier)
- if namespace.type == "Group"
+ if namespace.is_a?(Group)
users.push(*namespace.users)
else
users << namespace.owner