diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-06 12:52:01 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-06 12:52:01 +0300 |
| commit | bf5fb04e5c23af42680d126f44031d7c4331b563 (patch) | |
| tree | 3c52820ce2fc53b5d6d168bb836eca2700f7289a | |
| parent | e77ba96fd09efba591a9df28b4f4cab6d72569fd (diff) | |
| parent | 4034851c13b381dbc060ee000fcb078df211cd72 (diff) | |
| download | gitlab-ce-bf5fb04e5c23af42680d126f44031d7c4331b563.tar.gz | |
Merge branch 'master' of github.com:gitlabhq/gitlabhq
| -rw-r--r-- | .pkgr.yml | 6 | ||||
| -rw-r--r-- | app/views/projects/branches/_branch.html.haml | 2 |
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 |