Commit 375ebcab authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

improved activity ui

parent c94159ab
...@@ -616,6 +616,7 @@ p.time { ...@@ -616,6 +616,7 @@ p.time {
.wll { .wll {
padding:5px; padding:5px;
margin-top:5px;
border:none; border:none;
&:hover { &:hover {
background:none; background:none;
...@@ -632,6 +633,7 @@ p.time { ...@@ -632,6 +633,7 @@ p.time {
} }
ul { ul {
margin-left:50px; margin-left:50px;
margin-bottom:5px;
.avatar { .avatar {
width:24px; width:24px;
} }
......
...@@ -21,6 +21,11 @@ class Event < ActiveRecord::Base ...@@ -21,6 +21,11 @@ class Event < ActiveRecord::Base
end end
end end
# For now only push events enabled for system
def allowed?
push?
end
def push? def push?
action == self.class::Pushed action == self.class::Pushed
end end
......
.wll.event_feed - if event.allowed?
.wll.event_feed
- if event.push? - if event.push?
- if event.new_branch? - if event.new_branch?
= image_tag gravatar_icon(event.pusher_email), :class => "avatar" = image_tag gravatar_icon(event.pusher_email), :class => "avatar"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment