Merge branch 'master' into fixes/api

This commit is contained in:
Sebastian Ziebell 2013-02-27 17:52:59 +01:00
commit 3bb342b961
4 changed files with 31 additions and 28 deletions

View file

@ -336,7 +336,7 @@ module Gitlab
authorize! :download_code, user_project
page = params[:page] || 0
per_page = params[:per_page].to_i || 20
per_page = (params[:per_page] || 20).to_i
ref = params[:ref_name] || user_project.try(:default_branch) || 'master'
commits = user_project.repository.commits(ref, nil, per_page, page * per_page)