Merge branch '26287-link-branch-in-calendar-activity' into 'master'
Add Links to Branches in Calendar Activity Closes #26287 See merge request !9224
This commit is contained in:
commit
6f720ce262
|
@ -10,13 +10,17 @@
|
|||
%i.fa.fa-clock-o
|
||||
= event.created_at.to_s(:time)
|
||||
- if event.push?
|
||||
#{event.action_name} #{event.ref_type} #{event.ref_name}
|
||||
#{event.action_name} #{event.ref_type}
|
||||
%strong
|
||||
- commits_path = namespace_project_commits_path(event.project.namespace, event.project, event.ref_name)
|
||||
= link_to_if event.project.repository.branch_exists?(event.ref_name), event.ref_name, commits_path
|
||||
- else
|
||||
= event_action_name(event)
|
||||
- if event.note?
|
||||
%strong= link_to event.note_target.to_reference, event_note_target_path(event)
|
||||
- elsif event.target
|
||||
%strong= link_to event.target.to_reference, [event.project.namespace.becomes(Namespace), event.project, event.target]
|
||||
%strong
|
||||
- if event.note?
|
||||
= link_to event.note_target.to_reference, event_note_target_path(event)
|
||||
- elsif event.target
|
||||
= link_to event.target.to_reference, [event.project.namespace.becomes(Namespace), event.project, event.target]
|
||||
|
||||
at
|
||||
%strong
|
||||
|
|
|
@ -0,0 +1,4 @@
|
|||
---
|
||||
title: Add Links to Branches in Calendar Activity
|
||||
merge_request: 9224
|
||||
author: Jan Christophersen
|
Loading…
Reference in New Issue