Events improved & refactored. Dashboard pollished
This commit is contained in:
parent
3ac9c3ad7f
commit
00dc34e192
11 changed files with 139 additions and 126 deletions
16
app/views/events/_event_merge_request.html.haml
Normal file
16
app/views/events/_event_merge_request.html.haml
Normal file
|
@ -0,0 +1,16 @@
|
|||
= image_tag gravatar_icon(event.author_email), :class => "avatar"
|
||||
%strong #{event.author_name}
|
||||
%span.event_label= event.action_name
|
||||
merge request
|
||||
= link_to project_merge_request_path(event.project, event.merge_request) do
|
||||
%strong= truncate event.merge_request_title
|
||||
at
|
||||
%strong= link_to event.project.name, event.project
|
||||
%span.cgray
|
||||
= time_ago_in_words(event.created_at)
|
||||
ago.
|
||||
%br
|
||||
%span= event.merge_request.source_branch
|
||||
→
|
||||
%span= event.merge_request.target_branch
|
||||
|
Loading…
Add table
Add a link
Reference in a new issue