summaryrefslogtreecommitdiff
path: root/app/views/events/_event.html.haml
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-04-02 00:24:45 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-04-02 00:24:45 +0300
commit00dc34e1929e914d1f4f194888d9d94e513fdaa5 (patch)
treeed657843ea14864fb81f5eb07c89e896785b0008 /app/views/events/_event.html.haml
parent3ac9c3ad7f0fc4e42e59d0e1fa0bce72dbd9e86b (diff)
downloadgitlab-ce-00dc34e1929e914d1f4f194888d9d94e513fdaa5.tar.gz
Events improved & refactored. Dashboard pollished
Diffstat (limited to 'app/views/events/_event.html.haml')
-rw-r--r--app/views/events/_event.html.haml12
1 files changed, 4 insertions, 8 deletions
diff --git a/app/views/events/_event.html.haml b/app/views/events/_event.html.haml
index f091fff5a9e..ed45e27a7b7 100644
--- a/app/views/events/_event.html.haml
+++ b/app/views/events/_event.html.haml
@@ -1,12 +1,8 @@
- if event.allowed?
.event_feed
- - if event.new_issue?
- = render "events/event_new_issue", :event => event
- - elsif event.new_merge_request?
- = render "events/event_new_merge_request", :event => event
- - elsif event.changed_merge_request?
- = render "events/event_changed_merge_request", :event => event
- - elsif event.changed_issue?
- = render "events/event_changed_issue", :event => event
+ - if event.issue?
+ = render "events/event_issue", :event => event
+ - elsif event.merge_request?
+ = render "events/event_merge_request", :event => event
- elsif event.push?
= render "events/event_push", :event => event