diff options
| author | Sebastian Ziebell <sebastian.ziebell@asquera.de> | 2013-02-27 17:52:59 +0100 |
|---|---|---|
| committer | Sebastian Ziebell <sebastian.ziebell@asquera.de> | 2013-02-27 17:52:59 +0100 |
| commit | 3bb342b961f2a02098175e24855ab56fc1785c43 (patch) | |
| tree | 158cd941d1f1ca2d2427893822f6303c1ad7cfa6 /lib/api | |
| parent | 7499f65014257989510da50505fa7c0f5a4fae88 (diff) | |
| parent | 33cd1ae9dce7d8a798ca312a27eb0b4872892f05 (diff) | |
| download | gitlab-ce-3bb342b961f2a02098175e24855ab56fc1785c43.tar.gz | |
Merge branch 'master' into fixes/api
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/projects.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/projects.rb b/lib/api/projects.rb index a65d65840b0..abd115d31b0 100644 --- a/lib/api/projects.rb +++ b/lib/api/projects.rb @@ -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) |