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/models/event.rb | |
| parent | e6f20e52f6f77f77942c047dca91d3e325cce8b2 (diff) | |
| download | gitlab-ce-b4aaced71a65faffd49ffa2c705fb574ed532701.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/models/event.rb')
| -rw-r--r-- | app/models/event.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/event.rb b/app/models/event.rb index 15ee170ca75..996768a267b 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -406,7 +406,7 @@ class Event < ActiveRecord::Base def body? if push? - push_with_commits? || rm_ref? + push_with_commits? elsif note? true else |