diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-08-23 12:27:24 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-08-23 12:27:24 +0300 |
| commit | 8e27c3db443de317f5bbea67ba4ed98641bbd7eb (patch) | |
| tree | 28709e10eb40f4c4a3ef424c979d8d1b966cb034 /app | |
| parent | 101d52b360a6a43f1633c5dd60b78e37bc8c4339 (diff) | |
| parent | b4aaced71a65faffd49ffa2c705fb574ed532701 (diff) | |
Merge branch 'fix-push-events-branch-removals' into 'master'
Fix displaying events of removed events and events without commit messages
Closes #36685 and #36722
See merge request !13721
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/events_helper.rb | 1 | ||||
| -rw-r--r-- | app/models/event.rb | 2 | ||||
| -rw-r--r-- | app/views/events/_event_push.atom.haml | 13 | ||||
| -rw-r--r-- | app/views/events/event/_push.html.haml | 4 |
4 files changed, 9 insertions, 11 deletions
diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index c6f98e7e782..b331693c789 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -181,6 +181,7 @@ module EventsHelper end def event_commit_title(message) + message ||= '' (message.split("\n").first || "").truncate(70) rescue "--broken encoding" 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 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") diff --git a/app/views/events/event/_push.html.haml b/app/views/events/event/_push.html.haml index 973c652ad88..53ebdd6d2ff 100644 --- a/app/views/events/event/_push.html.haml +++ b/app/views/events/event/_push.html.haml @@ -41,7 +41,3 @@ %li.commits-stat = link_to create_mr_path(project.default_branch, event.ref_name, project) do Create Merge Request -- elsif event.rm_ref? - .event-body - %ul.well-list.event_commits - = render "events/commit", project: project, event: event |