Commit 6f720ce2 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch '26287-link-branch-in-calendar-activity' into 'master'

Add Links to Branches in Calendar Activity

Closes #26287

See merge request !9224
parents aa4e9f86 fa810e4f
...@@ -10,13 +10,17 @@ ...@@ -10,13 +10,17 @@
%i.fa.fa-clock-o %i.fa.fa-clock-o
= event.created_at.to_s(:time) = event.created_at.to_s(:time)
- if event.push? - 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 - else
= event_action_name(event) = event_action_name(event)
- if event.note? %strong
%strong= link_to event.note_target.to_reference, event_note_target_path(event) - if event.note?
- elsif event.target = link_to event.note_target.to_reference, event_note_target_path(event)
%strong= link_to event.target.to_reference, [event.project.namespace.becomes(Namespace), event.project, event.target] - elsif event.target
= link_to event.target.to_reference, [event.project.namespace.becomes(Namespace), event.project, event.target]
at at
%strong %strong
......
---
title: Add Links to Branches in Calendar Activity
merge_request: 9224
author: Jan Christophersen
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment