deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix bug when it has been switched to tag.

Browse source
This commit is contained in:
Sato Hiroyuki 2013-02-05 14:59:13 +09:00
parent 8ff5cf9cd5
commit df85c9c06a
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/extracts_path.rb
View file

@ -117,7 +117,10 @@ module ExtractsPath
@id = File.join(@ref, @path) @id = File.join(@ref, @path)
@commit = CommitDecorator.decorate(@project.repository.commit(@ref)) # It is used "@project.repository.commits(@ref, @path, 1, 0)",
# because "@project.repository.commit(@ref)" returns wrong commit when @ref is tag name.
commits = @project.repository.commits(@ref, @path, 1, 0)
@commit = CommitDecorator.decorate(commits.first)
@tree = Tree.new(@commit.tree, @ref, @path) @tree = Tree.new(@commit.tree, @ref, @path)
@tree = TreeDecorator.new(@tree) @tree = TreeDecorator.new(@tree)

2
lib/gitlab/graph/json_builder.rb
View file

@ -113,7 +113,7 @@ module Gitlab
def include_ref?(commit) def include_ref?(commit)
heads = commit.refs.select do |ref| heads = commit.refs.select do |ref|
ref.is_a?(Grit::Head) or ref.is_a?(Grit::Remote) ref.is_a?(Grit::Head) or ref.is_a?(Grit::Remote) or ref.is_a?(Grit::Tag)
end end
heads.map! do |head| heads.map! do |head|