Commit 30c661b6 authored by Phil Hughes's avatar Phil Hughes

Merge branch...

Merge branch '54002-activity-feed-missing-padding-in-event-note-when-a-branch-is-deleted' into 'master'

Resolve "Activity Feed - Missing padding in event note when a branch is deleted"

Closes #54002

See merge request gitlab-org/gitlab-ce!23038
parents c9343960 e528866a
...@@ -7,10 +7,10 @@ ...@@ -7,10 +7,10 @@
.event-title.d-flex.flex-wrap .event-title.d-flex.flex-wrap
= inline_event_icon(event) = inline_event_icon(event)
%span.event-type.d-inline-block.append-right-4.pushed #{event.action_name} #{event.ref_type} %span.event-type.d-inline-block.append-right-4.pushed #{event.action_name} #{event.ref_type}
%span %span.append-right-4
- commits_link = project_commits_path(project, event.ref_name) - commits_link = project_commits_path(project, event.ref_name)
- should_link = event.tag? ? project.repository.tag_exists?(event.ref_name) : project.repository.branch_exists?(event.ref_name) - should_link = event.tag? ? project.repository.tag_exists?(event.ref_name) : project.repository.branch_exists?(event.ref_name)
= link_to_if should_link, event.ref_name, commits_link, class: 'ref-name append-right-4' = link_to_if should_link, event.ref_name, commits_link, class: 'ref-name'
= render "events/event_scope", event: event = render "events/event_scope", event: event
......
---
title: Adds margin after a deleted branch name in the activity feed.
merge_request: 23038
author:
type: fixed
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