summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.pkgr.yml6
-rw-r--r--app/views/projects/branches/_branch.html.haml2
2 files changed, 7 insertions, 1 deletions
diff --git a/.pkgr.yml b/.pkgr.yml
index 97d78b6ef69..cf96e7916d8 100644
--- a/.pkgr.yml
+++ b/.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
diff --git a/app/views/projects/branches/_branch.html.haml b/app/views/projects/branches/_branch.html.haml
index 54a7b934dd7..08a537e0541 100644
--- a/app/views/projects/branches/_branch.html.haml
+++ b/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