Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
iv
gitlab-ce
Commits
77dc71d5
Commit
77dc71d5
authored
May 14, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix mentioning of private groups.
parent
910794ba
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
app/models/concerns/mentionable.rb
app/models/concerns/mentionable.rb
+2
-2
app/models/concerns/participable.rb
app/models/concerns/participable.rb
+1
-1
No files found.
app/models/concerns/mentionable.rb
View file @
77dc71d5
...
...
@@ -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
...
...
app/models/concerns/participable.rb
View file @
77dc71d5
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment