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

Rspec fixes

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-01-04 18:50:31 +02:00
parent dccd8b6eaa
commit afbdbb0c95
22 changed files with 149 additions and 199 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/api/projects.rb
View file

@ -257,7 +257,7 @@ module Gitlab
per_page = params[:per_page] || 20
ref = params[:ref_name] || user_project.try(:default_branch) || 'master'
commits = user_project.commits(ref, nil, per_page, page * per_page)
commits = user_project.repository.commits(ref, nil, per_page, page * per_page)
present CommitDecorator.decorate(commits), with: Entities::RepoCommit
end
@ -375,10 +375,10 @@ module Gitlab
ref = params[:sha]
commit = user_project.commit ref
commit = user_project.repository.commit ref
not_found! "Commit" unless commit
tree = Tree.new commit.tree, user_project, ref, params[:filepath]
tree = Tree.new commit.tree, ref, params[:filepath]
not_found! "File" unless tree.try(:tree)
content_type tree.mime_type