diff --git a/Gemfile b/Gemfile index f9329434..4cef4e03 100644 --- a/Gemfile +++ b/Gemfile @@ -9,7 +9,7 @@ gem "stamp" gem "kaminari" gem "haml-rails" gem "jquery-rails" -gem "grit", :git => "https://github.com/gitlabhq/grit.git", :ref => "810e3c11787e9d84c5925a7edc3264db0f04bb49" +gem "grit", :git => "https://github.com/gitlabhq/grit.git", :ref => "9536f306645f2d6b1f993ae02d3a29893ba8881f" gem "gitolite", :git => "https://github.com/gitlabhq/gitolite-client.git", :ref => "9b715ca8bab6529f6c92204a25f84d12f25a6eb0" gem "carrierwave" gem "six" diff --git a/app/views/commits/_head.html.haml b/app/views/commits/_head.html.haml index 23ad920d..6c261137 100644 --- a/app/views/commits/_head.html.haml +++ b/app/views/commits/_head.html.haml @@ -13,12 +13,12 @@ %li{:class => "#{branches_tab_class}"} = link_to project_repository_path(@project) do Branches - %span.number= @project.repo.branches.count + %span.number= @project.repo.branch_count %li{:class => "#{'active' if current_page?(tags_project_repository_path(@project)) }"} = link_to tags_project_repository_path(@project) do Tags - %span.number= @project.repo.tags.count + %span.number= @project.repo.tag_count - if current_page?(project_commits_path(@project)) && current_user.private_token