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
Boxiang Sun
gitlab-ce
Commits
89f8020f
Commit
89f8020f
authored
9 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'mention-groups'
Conflicts: CHANGELOG
parents
8c4b98be
04a70d9f
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
27 additions
and
11 deletions
+27
-11
CHANGELOG
CHANGELOG
+2
-1
app/controllers/projects_controller.rb
app/controllers/projects_controller.rb
+1
-1
app/models/concerns/mentionable.rb
app/models/concerns/mentionable.rb
+6
-3
app/services/projects/participants_service.rb
app/services/projects/participants_service.rb
+8
-3
doc/markdown/markdown.md
doc/markdown/markdown.md
+1
-1
lib/gitlab/markdown.rb
lib/gitlab/markdown.rb
+9
-2
No files found.
CHANGELOG
View file @
89f8020f
...
...
@@ -38,6 +38,7 @@ v 7.8.0
- Add a commit calendar to the user profile (Hannes Rosenögger)
-
- Submit comment on command-enter
- Notify all members of a group when that group is mentioned in a comment, for example: `@gitlab-org` or `@sales`.
-
- Fix long broadcast message cut-off on left sidebar (Visay Keo)
- Add Project Avatars (Steven Thonus and Hannes Rosenögger)
...
...
This diff is collapsed.
Click to expand it.
app/controllers/projects_controller.rb
View file @
89f8020f
...
...
@@ -102,7 +102,7 @@ class ProjectsController < ApplicationController
note_type
=
params
[
'type'
]
note_id
=
params
[
'type_id'
]
autocomplete
=
::
Projects
::
AutocompleteService
.
new
(
@project
)
participants
=
::
Projects
::
ParticipantsService
.
new
(
@project
).
execute
(
note_type
,
note_id
)
participants
=
::
Projects
::
ParticipantsService
.
new
(
@project
,
current_user
).
execute
(
note_type
,
note_id
)
@suggestions
=
{
emojis:
autocomplete_emojis
,
...
...
This diff is collapsed.
Click to expand it.
app/models/concerns/mentionable.rb
View file @
89f8020f
...
...
@@ -51,9 +51,12 @@ module Mentionable
identifier
=
match
.
delete
"@"
if
identifier
==
"all"
users
.
push
(
*
project
.
team
.
members
.
flatten
)
elsif
namespace
=
Namespace
.
find_by
(
path:
identifier
)
if
namespace
.
type
==
"Group"
users
.
push
(
*
namespace
.
users
)
else
id
=
User
.
find_by
(
username:
identifier
).
try
(
:id
)
users
<<
User
.
find
(
id
)
unless
id
.
blank?
users
<<
namespace
.
owner
end
end
end
users
.
uniq
...
...
This diff is collapsed.
Click to expand it.
app/services/projects/participants_service.rb
View file @
89f8020f
module
Projects
class
ParticipantsService
<
BaseService
def
initialize
(
project
)
def
initialize
(
project
,
user
)
@project
=
project
@user
=
user
end
def
execute
(
note_type
,
note_id
)
...
...
@@ -12,7 +13,7 @@ module Projects
[]
end
team_members
=
sorted
(
@project
.
team
.
members
)
participants
=
all_members
+
team_members
+
participating
participants
=
all_members
+
groups
+
team_members
+
participating
participants
.
uniq
end
...
...
@@ -37,6 +38,10 @@ module Projects
users
.
uniq
.
to_a
.
compact
.
sort_by
(
&
:username
).
map
{
|
user
|
{
username:
user
.
username
,
name:
user
.
name
}
}
end
def
groups
@user
.
authorized_groups
.
sort_by
(
&
:path
).
map
{
|
group
|
{
username:
group
.
path
,
name:
group
.
name
}
}
end
def
all_members
[{
username:
"all"
,
name:
"Project and Group Members"
}]
end
...
...
This diff is collapsed.
Click to expand it.
doc/markdown/markdown.md
View file @
89f8020f
...
...
@@ -170,7 +170,7 @@ GFM will turn that reference into a link so you can navigate between them easily
GFM will recognize the following:
- @foo : for
team member
s
- @foo : for
specific team members or group
s
- @all : for the whole team
- #123 : for issues
- !123 : for merge requests
...
...
This diff is collapsed.
Click to expand it.
lib/gitlab/markdown.rb
View file @
89f8020f
...
...
@@ -202,8 +202,15 @@ module Gitlab
if
identifier
==
"all"
link_to
(
"@all"
,
project_url
(
project
),
options
)
elsif
User
.
find_by
(
username:
identifier
)
link_to
(
"@
#{
identifier
}
"
,
user_url
(
identifier
),
options
)
elsif
namespace
=
Namespace
.
find_by
(
path:
identifier
)
url
=
if
namespace
.
type
==
"Group"
group_url
(
identifier
)
else
user_url
(
identifier
)
end
link_to
(
"@
#{
identifier
}
"
,
url
,
options
)
end
end
...
...
This diff is collapsed.
Click to expand it.
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