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)
-    = link_to project.name_with_namespace, project
+  .project-access-icon
+    = visibility_level_icon(project.visibility_level)
 
-    - if current_page?(starred_explore_projects_path)
-      %strong.pull-right
-        = pluralize project.star_count, 'star'
+  .project-description
+    %h4.project-title
+      = link_to project.name_with_namespace, project
 
-  - if project.description.present?
-    %p.project-description.str-truncated
-      = project.description
+      - if current_page?(starred_explore_projects_path)
+        %strong.pull-right
+          = pluralize project.star_count, 'star'
 
-  .repo-info
-    - unless project.empty_repo?
-      = link_to pluralize(project.repository.round_commit_count, 'commit'), project_commits_path(project, project.default_branch)
-      ·
-      = link_to pluralize(project.repository.branch_names.count, 'branch'), project_branches_path(project)
-      ·
-      = link_to pluralize(project.repository.tag_names.count, 'tag'), project_tags_path(project)
-    - else
-      %i.icon-warning-sign
-      Empty repository
+    - if project.description.present?
+      %p.project-description.str-truncated
+        = project.description
 
+    .repo-info
+      - unless project.empty_repo?
+        = link_to pluralize(project.repository.round_commit_count, 'commit'), project_commits_path(project, project.default_branch)
+        ·
+        = link_to pluralize(project.repository.branch_names.count, 'branch'), project_branches_path(project)
+        ·
+        = link_to pluralize(project.repository.tag_names.count, 'tag'), project_tags_path(project)
+      - else
+        %i.icon-warning-sign
+        Empty repository