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

Merge branch 'master' into fixes/api

Browse source
This commit is contained in:
Sebastian Ziebell 2013-02-27 15:15:47 +01:00
commit 07f306d8af
4 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Gemfile
View file

@ -39,7 +39,8 @@ gem "pygments.rb", git: "https://github.com/gitlabhq/pygments.rb.git", branch:
gem "github-linguist", "~> 2.3.4" , require: "linguist" gem "github-linguist", "~> 2.3.4" , require: "linguist"
# API # API
gem "grape", "~> 0.2.1" gem "grape", "~> 0.3.1"
gem "grape-entity", "~> 0.2.0"
# Format dates and times # Format dates and times
# based on human-friendly examples # based on human-friendly examples

7
Gemfile.lock
View file

@ -182,8 +182,9 @@ GEM
pyu-ruby-sasl (~> 0.0.3.1) pyu-ruby-sasl (~> 0.0.3.1)
rubyntlm (~> 0.1.1) rubyntlm (~> 0.1.1)
gitlab_yaml_db (1.0.0) gitlab_yaml_db (1.0.0)
grape (0.2.2) grape (0.3.1)
activesupport activesupport
grape-entity (~> 0.2.0)
hashie (~> 1.2) hashie (~> 1.2)
multi_json (>= 1.3.2) multi_json (>= 1.3.2)
multi_xml multi_xml
@ -191,6 +192,7 @@ GEM
rack-accept rack-accept
rack-mount rack-mount
virtus virtus
grape-entity (0.2.0)
growl (1.0.3) growl (1.0.3)
guard (1.5.4) guard (1.5.4)
listen (>= 0.4.2) listen (>= 0.4.2)
@ -481,7 +483,8 @@ DEPENDENCIES
gitlab_omniauth-ldap (= 1.0.2) gitlab_omniauth-ldap (= 1.0.2)
gitlab_yaml_db (= 1.0.0) gitlab_yaml_db (= 1.0.0)
grack! grack!
grape (~> 0.2.1) grape (~> 0.3.1)
grape-entity (~> 0.2.0)
grit! grit!
grit_ext! grit_ext!
growl growl

1
lib/api.rb
View file

@ -22,7 +22,6 @@ module Gitlab
end end
format :json format :json
error_format :json
helpers APIHelpers helpers APIHelpers
mount Groups mount Groups

2
lib/api/projects.rb
View file

@ -340,7 +340,7 @@ module Gitlab
authorize! :download_code, user_project authorize! :download_code, user_project
page = params[:page] || 0 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' ref = params[:ref_name] || user_project.try(:default_branch) || 'master'
commits = user_project.repository.commits(ref, nil, per_page, page * per_page) commits = user_project.repository.commits(ref, nil, per_page, page * per_page)