Commit cd6280f4 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Use data[:commits] hash from event to render push info on dashboard

parent ff4471a3
...@@ -200,7 +200,7 @@ class Event < ActiveRecord::Base ...@@ -200,7 +200,7 @@ class Event < ActiveRecord::Base
# Max 20 commits from push DESC # Max 20 commits from push DESC
def commits def commits
@commits ||= data[:commits].map { |commit| repository.commit(commit[:id]) }.reverse @commits ||= data[:commits].reverse
end end
def commits_count def commits_count
...@@ -221,26 +221,8 @@ class Event < ActiveRecord::Base ...@@ -221,26 +221,8 @@ class Event < ActiveRecord::Base
end end
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? def push_with_commits?
md_ref? && commits.any? && parent_commit && last_commit md_ref? && commits.any? && commit_from && commit_to
rescue Grit::NoSuchPathError
false
end end
def last_push_to_non_root? def last_push_to_non_root?
......
...@@ -8,11 +8,10 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://sear ...@@ -8,11 +8,10 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://sear
@events.each do |event| @events.each do |event|
if event.proper? if event.proper?
event = EventDecorator.decorate(event)
xml.entry do xml.entry do
event_link = event.feed_url event_link = event_feed_url(event)
event_title = event.feed_title event_title = event_feed_title(event)
event_summary = event.feed_summary event_summary = event_feed_summary(event)
xml.id "tag:#{request.host},#{event.created_at.strftime("%Y-%m-%d")}:#{event.id}" xml.id "tag:#{request.host},#{event.created_at.strftime("%Y-%m-%d")}:#{event.id}"
xml.link :href => event_link xml.link :href => event_link
......
%li.commit %li.commit
%p %p
= link_to commit.short_id(8), project_commit_path(project, commit), class: "commit_short_id" = link_to commit[:id][0..8], project_commit_path(project, commit[:id]), class: "commit_short_id"
%span= commit.author_name %span= commit[:author][:name]
&ndash; &ndash;
= image_tag gravatar_icon(commit.author_email), class: "avatar", width: 16 = image_tag gravatar_icon(commit[:author][:email]), class: "avatar", width: 16
= gfm escape_once(truncate(commit.title, length: 50)) rescue "--broken encoding" = gfm escape_once(truncate(commit[:message], length: 50)) rescue "--broken encoding"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment