Merge branch 'master' of github.com:gitlabhq/gitlabhq

.pkgr.yml

@@ -5,6 +5,8 @@ targets:
   debian-7: &wheezy
     build_dependencies:
       - libicu-dev
+      - cmake
+      - pkg-config
     dependencies:
       - libicu48
       - libpcre3
@@ -13,6 +15,8 @@ targets:
   ubuntu-14.04:
     build_dependencies:
       - libicu-dev
+      - cmake
+      - pkg-config
     dependencies:
       - libicu52
       - libpcre3
@@ -20,6 +24,8 @@ targets:
   centos-6:
     build_dependencies:
       - libicu-devel
+      - cmake
+      - pkgconfig
     dependencies:
       - libicu
       - pcre

app/views/projects/branches/_branch.html.haml

@@ -2,7 +2,7 @@
 %li(class="js-branch-#{branch.name}")
   %h4
     = link_to project_tree_path(@project, branch.name) do
-      %strong= truncate(branch.name, length: 60)
+      %strong.str-truncated= branch.name
       - if branch.name == @repository.root_ref
         %span.label.label-info default
       - if @project.protected_branch? branch.name