diff options
| -rw-r--r-- | app/controllers/projects_controller.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/markdown.rb | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 2dcc19bed07..8f2253bfb7c 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -130,7 +130,7 @@ class ProjectsController < ApplicationController [] end team_members = sorted(@project.team.members) - participants = team_members + participating + participants = [{ username: "all", name: "Group Members" }] + team_members + participating @suggestions = { emojis: Emoji.names.map { |e| { name: e, path: view_context.image_url("emoji/#{e}.png") } }, issues: @project.issues.select([:iid, :title, :description]), diff --git a/lib/gitlab/markdown.rb b/lib/gitlab/markdown.rb index c04be788f07..759bedee80b 100644 --- a/lib/gitlab/markdown.rb +++ b/lib/gitlab/markdown.rb @@ -169,7 +169,12 @@ module Gitlab end def reference_user(identifier, project = @project) - if user = User.find_by(username: identifier) + if identifier == "all" + options = html_options.merge( + class: "gfm gfm-team_member #{html_options[:class]}" + ) + link_to("@all", project_url(project), options) + elsif user = User.find_by(username: identifier) options = html_options.merge( class: "gfm gfm-team_member #{html_options[:class]}" ) |