diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2017-08-21 17:27:06 +0200 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2017-08-22 20:15:45 +0200 |
| commit | b4aaced71a65faffd49ffa2c705fb574ed532701 (patch) | |
| tree | 149d1f65c9cab089046d8bf7af4bea57efa235f3 /app/views/events/_event_push.atom.haml | |
| parent | e6f20e52f6f77f77942c047dca91d3e325cce8b2 (diff) | |
| download | gitlab-ce-fix-push-events-branch-removals.tar.gz | |
Fix display of push events for removed refsfix-push-events-branch-removals
This changes the style of push events that remove tags or branches so
they don't display the commit details. This prevents displaying commit
details such as:
000000 . --broken encoding
Instead we now simply display the header such as:
Administrator deleted branch example-branch
This is displayed in the same style as events for newly created
branches/tags.
This commit also ensures that if no commit message is present we simply
don't display anything, instead of "--broken encoding".
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/36685
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/36722
Diffstat (limited to 'app/views/events/_event_push.atom.haml')
| -rw-r--r-- | app/views/events/_event_push.atom.haml | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/app/views/events/_event_push.atom.haml b/app/views/events/_event_push.atom.haml index bf655f9d21a..e3c5fd55f08 100644 --- a/app/views/events/_event_push.atom.haml +++ b/app/views/events/_event_push.atom.haml @@ -5,9 +5,10 @@ %i at = event.created_at.to_s(:short) - %blockquote= markdown(escape_once(event.commit_title), pipeline: :atom, project: event.project, author: event.author) - - if event.commits_count > 1 - %p - %i - \... and - = pluralize(event.commits_count - 1, "more commit") + - unless event.rm_ref? + %blockquote= markdown(escape_once(event.commit_title), pipeline: :atom, project: event.project, author: event.author) + - if event.commits_count > 1 + %p + %i + \... and + = pluralize(event.commits_count - 1, "more commit") |