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
This commit is contained in:
Phil Hughes 2018-11-14 12:14:32 +00:00
commit 30c661b63e
2 changed files with 7 additions and 2 deletions

View File

@ -7,10 +7,10 @@
.event-title.d-flex.flex-wrap
= inline_event_icon(event)
%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)
- 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

View File

@ -0,0 +1,5 @@
---
title: Adds margin after a deleted branch name in the activity feed.
merge_request: 23038
author:
type: fixed