From b81649135627634956e05bd6fd5276d7342188b5 Mon Sep 17 00:00:00 2001
From: Daniel Loman <dloman@toyon.com>
Date: Tue, 24 Jun 2014 11:26:31 -0700
Subject: added str-truncated to branch list to fix issue #7192

---
 app/views/projects/branches/_branch.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
-- 
cgit v1.2.1


From 20d0d5a7e8a54083b1203090a98e82adfaf64038 Mon Sep 17 00:00:00 2001
From: Martin Mrvka <martin.mrvka@ut11.net>
Date: Tue, 2 Sep 2014 08:14:50 +0200
Subject: Added cmake and pkg-config as build dependency for pkgr

---
 .pkgr.yml | 6 ++++++
 1 file changed, 6 insertions(+)

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
-- 
cgit v1.2.1