diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-03-01 22:43:04 +0200 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-03-01 22:43:04 +0200 |
commit | 5263dd4297e2ba71c40d74dcfb8511fec68e6620 (patch) | |
tree | 8d98da2fd6e777770872695ec02b54fdbff6db62 /app/views/events/_event.html.haml | |
parent | 00028702fc516f799296d10a1d0da960e93a0381 (diff) | |
download | gitlab-ce-5263dd4297e2ba71c40d74dcfb8511fec68e6620.tar.gz |
Events displayed on project page. \n Fixed theme issue. \n New issue, mr events enabled
Diffstat (limited to 'app/views/events/_event.html.haml')
-rw-r--r-- | app/views/events/_event.html.haml | 38 |
1 files changed, 7 insertions, 31 deletions
diff --git a/app/views/events/_event.html.haml b/app/views/events/_event.html.haml index b6fd425826b..23a8601bd75 100644 --- a/app/views/events/_event.html.haml +++ b/app/views/events/_event.html.haml @@ -1,32 +1,8 @@ - if event.allowed? - .wll.event_feed - - if event.push? - - if event.new_branch? - = image_tag gravatar_icon(event.pusher_email), :class => "avatar" - %strong #{event.pusher_name} - pushed new branch - = link_to project_commits_path(event.project, :ref => event.branch_name) do - %strong= event.branch_name - at - %strong= link_to event.project.name, event.project - %span.cgray - = time_ago_in_words(event.created_at) - ago. - - else - = image_tag gravatar_icon(event.pusher_email), :class => "avatar" - %strong #{event.pusher_name} - pushed to - = link_to project_commits_path(event.project, :ref => event.branch_name) do - %strong= event.branch_name - at - %strong= link_to event.project.name, event.project - %span.cgray - = time_ago_in_words(event.created_at) - ago. - - if event.commits.count > 1 - = link_to compare_project_commits_path(event.project, :from => event.commits.first.prev_commit_id, :to => event.commits.last.id) do - Compare #{event.commits.first.commit.id[0..8]}...#{event.commits.last.id[0..8]} - - @project = event.project - %ul.unstyled - = render event.commits - + .event_feed + - if event.new_issue? + = render "events/event_new_issue", :event => event + - if event.new_merge_request? + = render "events/event_new_merge_request", :event => event + - elsif event.push? + = render "events/event_push", :event => event |