6 files changed, 11 insertions, 8 deletions
diff --git a/lib/gitlab/closing_issue_extractor.rb b/lib/gitlab/closing_issue_extractor.rb
index ab184d95c05..aeec595782c 100644
--- a/lib/gitlab/closing_issue_extractor.rb
+++ b/lib/gitlab/closing_issue_extractor.rb
@@ -8,7 +8,7 @@ module Gitlab
 
     def closed_by_message(message)
       return [] if message.nil?
-      
+
       closing_statements = message.scan(ISSUE_CLOSING_REGEX).
         map { |ref| ref[0] }.join(" ")
 
diff --git a/lib/gitlab/markdown/external_issue_reference_filter.rb b/lib/gitlab/markdown/external_issue_reference_filter.rb
index 2e74c6e45e2..afd28dd8cf3 100644
--- a/lib/gitlab/markdown/external_issue_reference_filter.rb
+++ b/lib/gitlab/markdown/external_issue_reference_filter.rb
@@ -48,7 +48,7 @@ module Gitlab
 
           %(<a href="#{url}"
                title="#{title}"
-               class="#{klass}">#{issue}</a>)
+               class="#{klass}">#{match}</a>)
         end
       end
 
diff --git a/lib/gitlab/markdown/issue_reference_filter.rb b/lib/gitlab/markdown/issue_reference_filter.rb
index 2815626e247..dea04761ead 100644
--- a/lib/gitlab/markdown/issue_reference_filter.rb
+++ b/lib/gitlab/markdown/issue_reference_filter.rb
@@ -52,7 +52,7 @@ module Gitlab
 
             %(<a href="#{url}"
                  title="#{title}"
-                 class="#{klass}">#{project_ref}##{id}</a>)
+                 class="#{klass}">#{match}</a>)
           else
             match
           end
diff --git a/lib/gitlab/markdown/merge_request_reference_filter.rb b/lib/gitlab/markdown/merge_request_reference_filter.rb
index fddc050635f..80779819485 100644
--- a/lib/gitlab/markdown/merge_request_reference_filter.rb
+++ b/lib/gitlab/markdown/merge_request_reference_filter.rb
@@ -52,7 +52,7 @@ module Gitlab
 
             %(<a href="#{url}"
                  title="#{title}"
-                 class="#{klass}">#{project_ref}!#{id}</a>)
+                 class="#{klass}">#{match}</a>)
           else
             match
           end
diff --git a/lib/gitlab/markdown/snippet_reference_filter.rb b/lib/gitlab/markdown/snippet_reference_filter.rb
index f22f08de27c..174ba58af6c 100644
--- a/lib/gitlab/markdown/snippet_reference_filter.rb
+++ b/lib/gitlab/markdown/snippet_reference_filter.rb
@@ -52,7 +52,7 @@ module Gitlab
 
             %(<a href="#{url}"
                  title="#{title}"
-                 class="#{klass}">#{project_ref}$#{id}</a>)
+                 class="#{klass}">#{match}</a>)
           else
             match
           end
diff --git a/lib/gitlab/markdown/user_reference_filter.rb b/lib/gitlab/markdown/user_reference_filter.rb
index ca7fd7b0338..c9972957182 100644
--- a/lib/gitlab/markdown/user_reference_filter.rb
+++ b/lib/gitlab/markdown/user_reference_filter.rb
@@ -65,7 +65,8 @@ module Gitlab
         url = urls.namespace_project_url(project.namespace, project,
                                          only_path: context[:only_path])
 
-        %(<a href="#{url}" class="#{link_class}">@all</a>)
+        text = User.reference_prefix + 'all'
+        %(<a href="#{url}" class="#{link_class}">#{text}</a>)
       end
 
       def link_to_namespace(namespace)
@@ -83,7 +84,8 @@ module Gitlab
 
         url = urls.group_url(group, only_path: context[:only_path])
 
-        %(<a href="#{url}" class="#{link_class}">@#{group}</a>)
+        text = Group.reference_prefix + group
+        %(<a href="#{url}" class="#{link_class}">#{text}</a>)
       end
 
       def link_to_user(user, namespace)
@@ -91,7 +93,8 @@ module Gitlab
 
         url = urls.user_url(user, only_path: context[:only_path])
 
-        %(<a href="#{url}" class="#{link_class}">@#{user}</a>)
+        text = User.reference_prefix + user
+        %(<a href="#{url}" class="#{link_class}">#{text}</a>)
       end
 
       def user_can_reference_group?(group)