Fix missing links and incorrect display of issue numbers for notes, comments, and merge requests
This commit is contained in:
parent
cb0d63b9e3
commit
afc5b7110f
|
@ -52,6 +52,8 @@ module EventsHelper
|
||||||
"#{event.author_name} #{event.push_action_name} #{event.ref_type} #{event.ref_name} at #{event.project_name}"
|
"#{event.author_name} #{event.push_action_name} #{event.ref_type} #{event.ref_name} at #{event.project_name}"
|
||||||
elsif event.membership_changed?
|
elsif event.membership_changed?
|
||||||
"#{event.author_name} #{event.action_name} #{event.project_name}"
|
"#{event.author_name} #{event.action_name} #{event.project_name}"
|
||||||
|
elsif event.note? && event.note_commit?
|
||||||
|
"#{event.author_name} commented on #{event.note_target_type} #{event.note_short_commit_id} at #{event.project_name}"
|
||||||
elsif event.note?
|
elsif event.note?
|
||||||
"#{event.author_name} commented on #{event.note_target_type} ##{truncate event.note_target_iid} at #{event.project_name}"
|
"#{event.author_name} commented on #{event.note_target_type} ##{truncate event.note_target_iid} at #{event.project_name}"
|
||||||
else
|
else
|
||||||
|
@ -64,6 +66,8 @@ module EventsHelper
|
||||||
project_issue_url(event.project, event.issue)
|
project_issue_url(event.project, event.issue)
|
||||||
elsif event.merge_request?
|
elsif event.merge_request?
|
||||||
project_merge_request_url(event.project, event.merge_request)
|
project_merge_request_url(event.project, event.merge_request)
|
||||||
|
elsif event.note? && event.note_commit?
|
||||||
|
project_commit_url(event.project, event.note_target)
|
||||||
elsif event.note?
|
elsif event.note?
|
||||||
if event.note_target
|
if event.note_target
|
||||||
if event.note_commit?
|
if event.note_commit?
|
||||||
|
@ -94,6 +98,8 @@ module EventsHelper
|
||||||
render "events/event_push", event: event
|
render "events/event_push", event: event
|
||||||
elsif event.merge_request?
|
elsif event.merge_request?
|
||||||
render "events/event_merge_request", merge_request: event.merge_request
|
render "events/event_merge_request", merge_request: event.merge_request
|
||||||
|
elsif event.push?
|
||||||
|
render "events/event_push", event: event
|
||||||
elsif event.note?
|
elsif event.note?
|
||||||
render "events/event_note", note: event.note
|
render "events/event_note", note: event.note
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
%div{:xmlns => "http://www.w3.org/1999/xhtml"}
|
%div{xmlns: "http://www.w3.org/1999/xhtml"}
|
||||||
%p= markdown issue.description
|
= markdown issue.description
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
%div{xmlns: "http://www.w3.org/1999/xhtml"}
|
%div{xmlns: "http://www.w3.org/1999/xhtml"}
|
||||||
%p= markdown merge_request.description
|
= markdown merge_request.description
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
%div{:xmlns => "http://www.w3.org/1999/xhtml"}
|
%div{xmlns: "http://www.w3.org/1999/xhtml"}
|
||||||
%p= markdown note.note
|
= markdown note.note
|
||||||
|
|
Loading…
Reference in New Issue