diff options
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | Gemfile.lock | 7 | ||||
| -rw-r--r-- | lib/api.rb | 1 | ||||
| -rw-r--r-- | lib/api/projects.rb | 2 |
4 files changed, 8 insertions, 5 deletions
@@ -39,7 +39,8 @@ gem "pygments.rb", git: "https://github.com/gitlabhq/pygments.rb.git", branch: gem "github-linguist", "~> 2.3.4" , require: "linguist" # API -gem "grape", "~> 0.2.1" +gem "grape", "~> 0.3.1" +gem "grape-entity", "~> 0.2.0" # Format dates and times # based on human-friendly examples diff --git a/Gemfile.lock b/Gemfile.lock index 3ca39aeae28..93abf857cb8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -182,8 +182,9 @@ GEM pyu-ruby-sasl (~> 0.0.3.1) rubyntlm (~> 0.1.1) gitlab_yaml_db (1.0.0) - grape (0.2.2) + grape (0.3.1) activesupport + grape-entity (~> 0.2.0) hashie (~> 1.2) multi_json (>= 1.3.2) multi_xml @@ -191,6 +192,7 @@ GEM rack-accept rack-mount virtus + grape-entity (0.2.0) growl (1.0.3) guard (1.5.4) listen (>= 0.4.2) @@ -481,7 +483,8 @@ DEPENDENCIES gitlab_omniauth-ldap (= 1.0.2) gitlab_yaml_db (= 1.0.0) grack! - grape (~> 0.2.1) + grape (~> 0.3.1) + grape-entity (~> 0.2.0) grit! grit_ext! growl diff --git a/lib/api.rb b/lib/api.rb index ffd980ca7e0..3264f6a8fa6 100644 --- a/lib/api.rb +++ b/lib/api.rb @@ -22,7 +22,6 @@ module Gitlab end format :json - error_format :json helpers APIHelpers mount Groups 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) |