From 05993f90e0cfc3a0e571b2eaa3b4b182a19e979f Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 4 Jan 2012 08:19:41 +0200 Subject: [PATCH] removed tags from repo activities --- app/models/repository.rb | 2 +- app/views/repositories/_head.html.haml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/repository.rb b/app/models/repository.rb index 8da5d2dd54a..f73fe17065b 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -113,7 +113,7 @@ class Repository end def commits_with_refs(n = 20) - commits = repo.refs.map { |ref| Commit.new(ref.commit, ref) } + commits = repo.branches.map { |ref| Commit.new(ref.commit, ref) } commits.sort! do |x, y| y.committed_date <=> x.committed_date diff --git a/app/views/repositories/_head.html.haml b/app/views/repositories/_head.html.haml index 894a301db9c..c22286ec094 100644 --- a/app/views/repositories/_head.html.haml +++ b/app/views/repositories/_head.html.haml @@ -1,7 +1,7 @@ .merge-tabs.repository = link_to project_repository_path(@project), :class => "activities-tab tab #{'active' if current_page?(project_repository_path(@project)) }" do %span - History + Activities = link_to branches_project_repository_path(@project), :class => "tab #{'active' if current_page?(branches_project_repository_path(@project)) }" do %span Branches