Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-02-23 14:59:37 +0300
committerPhil Hughes <me@iamphill.com>2016-03-01 16:03:39 +0300
commitaff5e73f2a1daedbbff148274ad9222d377280b2 (patch)
tree6e529f9351c8d96b153576b524927b91b8c2c3fd /app/helpers/events_helper.rb
parent7d41e4dc9d3365c68f7e54b545fd115e8455eae5 (diff)
Changed # to ! on merge requests on activity view
Closes #9082
Diffstat (limited to 'app/helpers/events_helper.rb')
-rw-r--r--app/helpers/events_helper.rb11
1 files changed, 9 insertions, 2 deletions
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