Send author to post hook. Display push activity to dashboard
This commit is contained in:
parent
796784c7c8
commit
bb164ebf1b
15 changed files with 107 additions and 11 deletions
19
app/views/dashboard/_events_feed.html.haml
Normal file
19
app/views/dashboard/_events_feed.html.haml
Normal file
|
@ -0,0 +1,19 @@
|
|||
- @events.each do |event|
|
||||
.wll.event_feed
|
||||
- if event.push?
|
||||
- if event.new_branch?
|
||||
User pushed new branch
|
||||
- else
|
||||
= image_tag gravatar_icon(event.pusher_email), :class => "avatar"
|
||||
#{event.pusher_name} pushed to
|
||||
= link_to project_commits_path(event.project, :ref => event.branch_name) do
|
||||
%strong= event.branch_name
|
||||
%span.cgray
|
||||
= time_ago_in_words(event.created_at)
|
||||
ago.
|
||||
- if event.commits.count > 1
|
||||
= link_to compare_project_commits_path(event.project, :from => event.commits.last, :to => event.commits.first) do
|
||||
Compare #{event.commits.last.id[0..8]}...#{event.commits.first.id[0..8]}
|
||||
- @project = event.project
|
||||
%ul.unstyled
|
||||
= render event.commits
|
|
@ -54,3 +54,12 @@
|
|||
%hr
|
||||
.row
|
||||
.dashboard_block= render "dashboard/issues_feed"
|
||||
|
||||
- unless @events.blank?
|
||||
%div.dashboard_category
|
||||
%h3
|
||||
Activities
|
||||
|
||||
%hr
|
||||
.row
|
||||
.dashboard_block= render "dashboard/events_feed"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue