kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix mentioning of private groups.

This commit is contained in:
Douwe Maan 2015-05-14 13:15:13 +02:00
parent 910794bae5
commit 77dc71d550
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/concerns/mentionable.rb
View File

@ -42,10 +42,10 @@ module Mentionable
SystemNoteService.cross_reference_exists?(target, local_reference)
end
def mentioned_users(current_user = nil, p = project)
def mentioned_users(current_user = nil)
return [] if mentionable_text.blank?
ext = Gitlab::ReferenceExtractor.new(p, current_user)
ext = Gitlab::ReferenceExtractor.new(self.project, current_user)
ext.analyze(mentionable_text)
ext.users.uniq
end

2
app/models/concerns/participable.rb
View File

@ -40,7 +40,7 @@ module Participable
meth = method(attr)
value =
if meth.arity == 1
if meth.arity == 1 || meth.arity == -1
meth.call(current_user)
else
meth.call