summaryrefslogtreecommitdiff
path: root/app/models/concerns
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-04-15 15:56:21 +0200
committerDouwe Maan <douwe@gitlab.com>2015-04-15 17:57:31 +0200
commit959ebbcade63423048320daaa814634c41842a36 (patch)
treefb2f8392d60cdabe6ed9b0ad47a43909b3866762 /app/models/concerns
parentb73ffbd3cb7dd89f54351b74e0cf4d1df63f0310 (diff)
downloadgitlab-ce-959ebbcade63423048320daaa814634c41842a36.tar.gz
Clean up code around commit mentions.
Diffstat (limited to 'app/models/concerns')
-rw-r--r--app/models/concerns/mentionable.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/concerns/mentionable.rb b/app/models/concerns/mentionable.rb
index b7882a2bb16..acd9a1edc48 100644
--- a/app/models/concerns/mentionable.rb
+++ b/app/models/concerns/mentionable.rb
@@ -42,10 +42,10 @@ module Mentionable
Note.cross_reference_exists?(target, local_reference)
end
- def mentioned_users(current_user = nil)
+ def mentioned_users(current_user = nil, p = project)
return [] if mentionable_text.blank?
- ext = Gitlab::ReferenceExtractor.new(self.project, current_user)
+ ext = Gitlab::ReferenceExtractor.new(p, current_user)
ext.analyze(mentionable_text)
ext.users.uniq
end