diff options
| author | Phil Hughes <me@iamphill.com> | 2018-11-14 12:14:32 +0000 |
|---|---|---|
| committer | John Jarvis <jarv@gitlab.com> | 2018-11-14 15:32:15 +0100 |
| commit | c7faf88fbc4cfe1fc13f51ac9d0a38e1464a76ad (patch) | |
| tree | 4fb3ef49d0c5fd7035a3ff33b9e054789f3b7d98 | |
| parent | 1d0c2eafa45b8f94202733d9b2ca6b54447953fd (diff) | |
| download | gitlab-ce-c7faf88fbc4cfe1fc13f51ac9d0a38e1464a76ad.tar.gz | |
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
| -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 |