Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

app/assets/javascripts/dispatcher.js.coffee

@@ -50,7 +50,7 @@ class Dispatcher
         new TreeView()
       when 'projects:blob:show'
         new BlobView()
-      when 'projects:labels:new'
+      when 'projects:labels:new', 'projects:labels:edit'
         new Labels()
 
     switch path.first()

app/assets/stylesheets/sections/dashboard.scss

@@ -89,6 +89,10 @@
   }
 }
 
+.project-description {
+  overflow: hidden;
+}
+
 .project-access-icon {
   margin-left: 10px;
   float: left;

app/assets/stylesheets/sections/projects.scss

@@ -192,6 +192,7 @@ ul.nav.nav-projects-tabs {
     background-image: none;
 
     .btn, &.btn {
+      white-space: normal;
       text-align: left;
       padding: 10px 15px;
       background-color: #F1f1f1;

app/views/explore/projects/_project.html.haml

 %li
-  %h4.project-title
   .project-access-icon
     = visibility_level_icon(project.visibility_level)
+
+  .project-description
+    %h4.project-title
       = link_to project.name_with_namespace, project
 
       - if current_page?(starred_explore_projects_path)
@@ -22,4 +24,3 @@
       - else
         %i.icon-warning-sign
         Empty repository
-