Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Ziebell <sebastian.ziebell@asquera.de>2013-02-27 18:15:47 +0400
committerSebastian Ziebell <sebastian.ziebell@asquera.de>2013-02-27 18:15:47 +0400
commit07f306d8af41c158ba57633fcb129d1a96169877 (patch)
tree318485e91cbcf28decc076715019a6f54e0559b0 /lib/api/projects.rb
parent3b3add35fb88578df96fe9b728ddac896ea9c944 (diff)
parente4b67d3b1831025cc74a7f73e0700014885dea80 (diff)
Merge branch 'master' into fixes/api
Diffstat (limited to 'lib/api/projects.rb')
-rw-r--r--lib/api/projects.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index c749c24f228..a1a7cee4032 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -340,7 +340,7 @@ module Gitlab
authorize! :download_code, user_project
page = params[:page] || 0
- per_page = params[:per_page] || 20
+ per_page = params[:per_page].to_i || 20
ref = params[:ref_name] || user_project.try(:default_branch) || 'master'
commits = user_project.repository.commits(ref, nil, per_page, page * per_page)