Recent push event
This commit is contained in:
parent
40af6e1ad2
commit
e0d1fba15e
11 changed files with 70 additions and 11 deletions
|
@ -1,8 +1,13 @@
|
|||
- if event.allowed?
|
||||
.event_feed
|
||||
- if event.issue?
|
||||
- if event.issue?
|
||||
.event_feed
|
||||
= render "events/event_issue", :event => event
|
||||
- elsif event.merge_request?
|
||||
|
||||
- elsif event.merge_request?
|
||||
.event_feed
|
||||
= render "events/event_merge_request", :event => event
|
||||
- elsif event.push?
|
||||
|
||||
- elsif event.push?
|
||||
.event_feed
|
||||
= render "events/event_push", :event => event
|
||||
|
||||
|
|
16
app/views/events/_event_last_push.html.haml
Normal file
16
app/views/events/_event_last_push.html.haml
Normal file
|
@ -0,0 +1,16 @@
|
|||
- if event && event.branch_name && event.project.merge_requests_enabled
|
||||
.event_lp
|
||||
%div
|
||||
= image_tag gravatar_icon(event.author_email), :class => "avatar"
|
||||
%span Your last push was to
|
||||
= event.ref_type
|
||||
= link_to project_commits_path(event.project, :ref => event.ref_name) do
|
||||
%strong= event.ref_name
|
||||
at
|
||||
%strong= link_to event.project.name, event.project
|
||||
%span.cgray
|
||||
= time_ago_in_words(event.created_at)
|
||||
ago.
|
||||
|
||||
= link_to new_mr_path_from_push_event(event), :title => "New Merge Request", :class => "btn small padded primary" do
|
||||
Merge Request
|
|
@ -27,3 +27,4 @@
|
|||
- else
|
||||
- event.commits.each do |commit|
|
||||
= render "events/commit", :commit => commit, :project => project
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue