summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com>2012-10-31 15:22:13 +0200
committerDmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com>2012-10-31 15:22:13 +0200
commit2032f4cd9665d0b4244e30160c64996dc37c0a0e (patch)
tree0a9680412262efa4789c997c11b718f792de0175 /lib
parent9014fb7525504dedaaca3b586af028455dc4004b (diff)
downloadgitlab-ce-2032f4cd9665d0b4244e30160c64996dc37c0a0e.tar.gz
Fix tests fail cause of issue with grit stub
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/graph_commit.rb18
1 files changed, 14 insertions, 4 deletions
diff --git a/lib/gitlab/graph_commit.rb b/lib/gitlab/graph_commit.rb
index 188fc422259..b1ac1a0223b 100644
--- a/lib/gitlab/graph_commit.rb
+++ b/lib/gitlab/graph_commit.rb
@@ -2,18 +2,18 @@ require "grit"
module Gitlab
class GraphCommit
- attr_accessor :time, :space
- attr_accessor :refs
+ attr_accessor :time, :space, :refs
include ActionView::Helpers::TagHelper
def self.to_graph(project)
@repo = project.repo
- commits = Grit::Commit.find_all(@repo, nil, {max_count: 650}).dup
+
+ commits = collect_commits(@repo).dup
ref_cache = {}
- commits.map! {|c| GraphCommit.new(Commit.new(c))}
+ commits.map! { |commit| GraphCommit.new(Commit.new(commit))}
commits.each { |commit| commit.add_refs(ref_cache, @repo) }
days = GraphCommit.index_commits(commits)
@@ -23,6 +23,16 @@ module Gitlab
return @days_json, @commits_json
end
+ # Get commits from repository
+ #
+ def self.collect_commits repo
+ Grit::Commit.find_all(repo, nil, {max_count: self.max_count})
+ end
+
+ def self.max_count
+ @max_count ||= 650
+ end
+
# Method is adding time and space on the
# list of commits. As well as returns date list
# corelated with time set on commits.