summaryrefslogtreecommitdiff
path: root/app/views/projects
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-03-01 22:43:04 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-03-01 22:43:04 +0200
commit5263dd4297e2ba71c40d74dcfb8511fec68e6620 (patch)
tree8d98da2fd6e777770872695ec02b54fdbff6db62 /app/views/projects
parent00028702fc516f799296d10a1d0da960e93a0381 (diff)
downloadgitlab-ce-5263dd4297e2ba71c40d74dcfb8511fec68e6620.tar.gz
Events displayed on project page. \n Fixed theme issue. \n New issue, mr events enabled
Diffstat (limited to 'app/views/projects')
-rw-r--r--app/views/projects/show.html.haml7
1 files changed, 3 insertions, 4 deletions
diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml
index 5fbed303da8..c30837bb53f 100644
--- a/app/views/projects/show.html.haml
+++ b/app/views/projects/show.html.haml
@@ -14,9 +14,8 @@
= text_field_tag :project_clone, @project.url_to_repo, :class => "xlarge one_click_select git_clone_url"
= simple_format @project.description
-- unless @activities.blank?
- .ui-box
- %h5.cgray Recent Activity
- .content_list= render "feed"
+- unless @events.blank?
+ %h5.cgray Recent Activity
+ .content_list= render @events