Use data[:commits] hash from event to render push info on dashboard
This commit is contained in:
parent
ff4471a3cd
commit
cd6280f4fe
3 changed files with 9 additions and 28 deletions
|
@ -200,7 +200,7 @@ class Event < ActiveRecord::Base
|
|||
|
||||
# Max 20 commits from push DESC
|
||||
def commits
|
||||
@commits ||= data[:commits].map { |commit| repository.commit(commit[:id]) }.reverse
|
||||
@commits ||= data[:commits].reverse
|
||||
end
|
||||
|
||||
def commits_count
|
||||
|
@ -221,26 +221,8 @@ class Event < ActiveRecord::Base
|
|||
end
|
||||
end
|
||||
|
||||
def repository
|
||||
project.repository
|
||||
end
|
||||
|
||||
def parent_commit
|
||||
repository.commit(commit_from)
|
||||
rescue => ex
|
||||
nil
|
||||
end
|
||||
|
||||
def last_commit
|
||||
repository.commit(commit_to)
|
||||
rescue => ex
|
||||
nil
|
||||
end
|
||||
|
||||
def push_with_commits?
|
||||
md_ref? && commits.any? && parent_commit && last_commit
|
||||
rescue Grit::NoSuchPathError
|
||||
false
|
||||
md_ref? && commits.any? && commit_from && commit_to
|
||||
end
|
||||
|
||||
def last_push_to_non_root?
|
||||
|
|
|
@ -8,11 +8,10 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://sear
|
|||
|
||||
@events.each do |event|
|
||||
if event.proper?
|
||||
event = EventDecorator.decorate(event)
|
||||
xml.entry do
|
||||
event_link = event.feed_url
|
||||
event_title = event.feed_title
|
||||
event_summary = event.feed_summary
|
||||
event_link = event_feed_url(event)
|
||||
event_title = event_feed_title(event)
|
||||
event_summary = event_feed_summary(event)
|
||||
|
||||
xml.id "tag:#{request.host},#{event.created_at.strftime("%Y-%m-%d")}:#{event.id}"
|
||||
xml.link :href => event_link
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
%li.commit
|
||||
%p
|
||||
= link_to commit.short_id(8), project_commit_path(project, commit), class: "commit_short_id"
|
||||
%span= commit.author_name
|
||||
= link_to commit[:id][0..8], project_commit_path(project, commit[:id]), class: "commit_short_id"
|
||||
%span= commit[:author][:name]
|
||||
–
|
||||
= image_tag gravatar_icon(commit.author_email), class: "avatar", width: 16
|
||||
= gfm escape_once(truncate(commit.title, length: 50)) rescue "--broken encoding"
|
||||
= image_tag gravatar_icon(commit[:author][:email]), class: "avatar", width: 16
|
||||
= gfm escape_once(truncate(commit[:message], length: 50)) rescue "--broken encoding"
|
||||
|
|
Loading…
Reference in a new issue