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

Merge pull request #3095 from fdiary/update-grape-for-ruby2.0

Browse source 
update grape to 0.3.1 for ruby 2.0 support.
This commit is contained in:
Nihad Abbasov 2013-02-27 06:06:02 -08:00
commit e4b67d3b18
3 changed files with 7 additions and 4 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

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