2012-05-19 05:25:16 -04:00
|
|
|
- if event.action_name == "merged"
|
|
|
|
|
.event_icon= image_tag "event_mr_merged.png"
|
2012-03-01 15:43:04 -05:00
|
|
|
= image_tag gravatar_icon(event.author_email), :class => "avatar"
|
2012-06-03 18:37:27 -04:00
|
|
|
%strong #{event.author_name}
|
2012-04-01 17:24:45 -04:00
|
|
|
%span.event_label= event.action_name
|
2012-06-03 18:37:27 -04:00
|
|
|
merge request
|
2012-03-01 15:43:04 -05:00
|
|
|
= link_to project_merge_request_path(event.project, event.merge_request) do
|
|
|
|
|
%strong= truncate event.merge_request_title
|
2012-06-03 18:37:27 -04:00
|
|
|
at
|
2012-03-01 15:43:04 -05:00
|
|
|
%strong= link_to event.project.name, event.project
|
|
|
|
|
%span.cgray
|
|
|
|
|
= time_ago_in_words(event.created_at)
|
|
|
|
|
ago.
|
2012-03-20 17:59:35 -04:00
|
|
|
%br
|
2012-04-01 17:24:45 -04:00
|
|
|
%span= event.merge_request.source_branch
|
2012-03-01 15:43:04 -05:00
|
|
|
→
|
2012-04-01 17:24:45 -04:00
|
|
|
%span= event.merge_request.target_branch
|
2012-03-01 15:43:04 -05:00
|
|
|
|
