Replaced prefix with to_reference method calls

5 files changed, 7 insertions, 11 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 449c4c5c56b..ff6d384f7fd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -30,6 +30,7 @@ v 8.5.1
   - Re-add the newrelic_rpm gem which was removed without any deprecation or warning (Stan Hu)
   - Update sentry-raven gem to 0.15.6
   - Add build coverage in project's builds page (Steffen Köhler)
+  - Changed # to ! for merge requests in activity view
 
 v 8.5.0
   - Fix duplicate "me" in tooltip of the "thumbsup" awards Emoji (Stan Hu)
diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index 0cb3223c0e1..127cd8f1812 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -155,12 +155,7 @@ module EventsHelper
 
   def event_note_title_html(event)
     if event.note_target
-      link_prefix =
-        if event.note_target.class.name == "Issue"
-          "#"
-        else
-          "!"
-        end
+      link_prefix = event.note_target.class.reference_prefix
 
       if event.note_commit?
         link_to(
@@ -175,11 +170,11 @@ module EventsHelper
         link_to(namespace_project_snippet_path(event.project.namespace,
                                                event.project,
                                                event.note_target)) do
-          "#{event.note_target_type} #{link_prefix}#{truncate event.note_target_id}"
+          "#{event.note_target_type} #{truncate event.note_target.to_reference}"
         end
       else
         link_to event_note_target_path(event) do
-          "#{event.note_target_type} #{link_prefix}#{truncate event.note_target_iid}"
+          "#{event.note_target_type} #{truncate event.note_target.to_reference}"
         end
       end
     else
diff --git a/app/views/events/event/_common.html.haml b/app/views/events/event/_common.html.haml
index 2f531e08a91..a606640b0f1 100644
--- a/app/views/events/event/_common.html.haml
+++ b/app/views/events/event/_common.html.haml
@@ -4,7 +4,7 @@
     = event_action_name(event)
 
   - if event.target
-    %strong= link_to "!#{event.target_iid}", [event.project.namespace.becomes(Namespace), event.project, event.target]
+    %strong= link_to "#{event.target.to_reference}", [event.project.namespace.becomes(Namespace), event.project, event.target]
 
   = event_preposition(event)
 
diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml
index e1de023e9be..abeadc83b53 100644
--- a/app/views/projects/merge_requests/_merge_request.html.haml
+++ b/app/views/projects/merge_requests/_merge_request.html.haml
@@ -48,7 +48,7 @@
             = note_count
 
   .merge-request-info
-    \#{merge_request.iid} ·
+    \#{merge_request.to_reference} ·
     opened #{time_ago_with_tooltip(merge_request.created_at, placement: 'bottom')}
     by #{link_to_member(@project, merge_request.author, avatar: false)}
     - if merge_request.target_project.default_branch != merge_request.target_branch
diff --git a/app/views/projects/merge_requests/show/_mr_title.html.haml b/app/views/projects/merge_requests/show/_mr_title.html.haml
index 94b49baadf5..b634a4af8d2 100644
--- a/app/views/projects/merge_requests/show/_mr_title.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_title.html.haml
@@ -2,7 +2,7 @@
   .status-box{ class: status_box_class(@merge_request) }
     = @merge_request.state_human_name
   %span.identifier
-    Merge Request !#{@merge_request.iid}
+    Merge Request #{@merge_request.to_reference}
   %span.creator
     ·
     by #{link_to_member(@project, @merge_request.author, size: 24)}