Merge branch 'mention-groups'

Conflicts:
	CHANGELOG

1 files changed, 9 insertions, 2 deletions

diff --git a/lib/gitlab/markdown.rb b/lib/gitlab/markdown.rb
index c0e83fb3078..78627f413c2 100644
--- a/lib/gitlab/markdown.rb
+++ b/lib/gitlab/markdown.rb
@@ -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