From 70c44a0da2bdeead90a99fe79e7c047d38b8ca5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Rosen=C3=B6gger?= <123haynes@gmail.com>
Date: Mon, 19 Jan 2015 21:37:20 +0100
Subject: Fix tests, merge conflicts, some minor issues and make the project
 avatar feature mergable

---
 app/views/groups/_projects.html.haml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'app/views/groups/_projects.html.haml')

diff --git a/app/views/groups/_projects.html.haml b/app/views/groups/_projects.html.haml
index 2c65b3049e3..2716ebf326b 100644
--- a/app/views/groups/_projects.html.haml
+++ b/app/views/groups/_projects.html.haml
@@ -12,6 +12,8 @@
     - projects.each do |project|
       %li.project-row
         = link_to project_path(project), class: dom_class(project) do
+          .dash-project-avatar
+            = project_icon(project.to_param, alt: '', class: 'avatar s24')
           .dash-project-access-icon
             = visibility_level_icon(project.visibility_level)
           %span.str-truncated
-- 
cgit v1.2.3