From aff5e73f2a1daedbbff148274ad9222d377280b2 Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Tue, 23 Feb 2016 11:59:37 +0000 Subject: Changed # to ! on merge requests on activity view Closes #9082 --- app/helpers/events_helper.rb | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'app/helpers/events_helper.rb') diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index 31bf45baeb7..0cb3223c0e1 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -155,6 +155,13 @@ module EventsHelper def event_note_title_html(event) if event.note_target + link_prefix = + if event.note_target.class.name == "Issue" + "#" + else + "!" + end + if event.note_commit? link_to( namespace_project_commit_path(event.project.namespace, event.project, @@ -168,11 +175,11 @@ module EventsHelper link_to(namespace_project_snippet_path(event.project.namespace, event.project, event.note_target)) do - "#{event.note_target_type} ##{truncate event.note_target_id}" + "#{event.note_target_type} #{link_prefix}#{truncate event.note_target_id}" end else link_to event_note_target_path(event) do - "#{event.note_target_type} ##{truncate event.note_target_iid}" + "#{event.note_target_type} #{link_prefix}#{truncate event.note_target_iid}" end end else -- cgit v1.2.1