mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-14 07:06:17 +10:00
@@ -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
|
||||
|
||||
@@ -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_iid}", [event.project.namespace.becomes(Namespace), event.project, event.target]
|
||||
|
||||
= event_preposition(event)
|
||||
|
||||
|
||||
@@ -48,7 +48,7 @@
|
||||
= note_count
|
||||
|
||||
.merge-request-info
|
||||
\##{merge_request.iid} ·
|
||||
\#{merge_request.iid} ·
|
||||
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
|
||||
|
||||
@@ -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.iid}
|
||||
%span.creator
|
||||
·
|
||||
by #{link_to_member(@project, @merge_request.author, size: 24)}
|
||||
|
||||
Reference in New Issue
Block a user