diff options
author | Martin Wortschack <mwortschack@gitlab.com> | 2018-11-14 12:14:32 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-11-14 12:14:32 +0000 |
commit | e528866a736161c70d9bac88d59c7118705cc4ee (patch) | |
tree | 582158b0c73210f96cdb14499bccc40715b6aca1 | |
parent | c93439605bdad009754be70007c798b3d345e677 (diff) | |
download | gitlab-ce-e528866a736161c70d9bac88d59c7118705cc4ee.tar.gz |
Resolve "Activity Feed - Missing padding in event note when a branch is deleted"
-rw-r--r-- | app/views/events/event/_push.html.haml | 4 | ||||
-rw-r--r-- | changelogs/unreleased/54002-activity-feed-missing-padding-in-event-note-when-a-branch-is-deleted.yml | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/app/views/events/event/_push.html.haml b/app/views/events/event/_push.html.haml index 82693ec832e..69914fccc48 100644 --- a/app/views/events/event/_push.html.haml +++ b/app/views/events/event/_push.html.haml @@ -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 diff --git a/changelogs/unreleased/54002-activity-feed-missing-padding-in-event-note-when-a-branch-is-deleted.yml b/changelogs/unreleased/54002-activity-feed-missing-padding-in-event-note-when-a-branch-is-deleted.yml new file mode 100644 index 00000000000..9f4f104a12c --- /dev/null +++ b/changelogs/unreleased/54002-activity-feed-missing-padding-in-event-note-when-a-branch-is-deleted.yml @@ -0,0 +1,5 @@ +--- +title: Adds margin after a deleted branch name in the activity feed. +merge_request: 23038 +author: +type: fixed |