Skip to content
Snippets Groups Projects
Commit 860e3ab5 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Event feed: Icons for some events

parent 1e4d15b4
No related branches found
No related tags found
No related merge requests found
app/assets/images/event_mr_merged.png

463 B

app/assets/images/event_push.png

632 B

Loading
Loading
@@ -645,6 +645,13 @@ p.time {
.avatar {
width:32px;
}
.event_icon {
float:right;
margin-right:2px;
img {
width:20px;
}
}
ul {
margin-left:50px;
margin-bottom:5px;
Loading
Loading
Loading
Loading
@@ -83,7 +83,6 @@
 
.project_name {
float:left;
width:360px;
margin:0;
margin-right:30px;
font-size:20px;
Loading
Loading
Loading
Loading
@@ -97,7 +97,6 @@
}
.project_name {
float:left;
width:360px;
margin:0;
margin-right:30px;
font-size:20px;
Loading
Loading
- if event.action_name == "merged"
.event_icon= image_tag "event_mr_merged.png"
= image_tag gravatar_icon(event.author_email), :class => "avatar"
%strong #{event.author_name}
%span.event_label= event.action_name
Loading
Loading
%div
.event_icon= image_tag "event_push.png"
= image_tag gravatar_icon(event.author_email), :class => "avatar"
%strong #{event.author_name}
%span.event_label= event.push_action_name
= event.ref_type
= link_to project_commits_path(event.project, :ref => event.ref_name) do
%strong= event.ref_name
at
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment