Download as
Browse Code »

Commit e4b67d3b1831025cc74a7f73e0700014885dea80

Authored by Nihad Abbasov
2 parents 8d847b89 3b548d92
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

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

update grape to 0.3.1 for ruby 2.0 support.
Showing 3 changed files with 7 additions and 4 deletions   Show diff stats
@@ -39,7 +39,8 @@ gem "pygments.rb", git: "https://github.com/gitlabhq/pygments.rb.git", branch: @@ -39,7 +39,8 @@ gem "pygments.rb", git: "https://github.com/gitlabhq/pygments.rb.git", branch:
39 gem "github-linguist", "~> 2.3.4" , require: "linguist" 39 gem "github-linguist", "~> 2.3.4" , require: "linguist"
40 40
41 # API 41 # API
42 -gem "grape", "~> 0.2.1" 42 +gem "grape", "~> 0.3.1"
  43 +gem "grape-entity", "~> 0.2.0"
43 44
44 # Format dates and times 45 # Format dates and times
45 # based on human-friendly examples 46 # based on human-friendly examples
@@ -182,8 +182,9 @@ GEM @@ -182,8 +182,9 @@ GEM
182 pyu-ruby-sasl (~> 0.0.3.1) 182 pyu-ruby-sasl (~> 0.0.3.1)
183 rubyntlm (~> 0.1.1) 183 rubyntlm (~> 0.1.1)
184 gitlab_yaml_db (1.0.0) 184 gitlab_yaml_db (1.0.0)
185 - grape (0.2.2) 185 + grape (0.3.1)
186 activesupport 186 activesupport
  187 + grape-entity (~> 0.2.0)
187 hashie (~> 1.2) 188 hashie (~> 1.2)
188 multi_json (>= 1.3.2) 189 multi_json (>= 1.3.2)
189 multi_xml 190 multi_xml
@@ -191,6 +192,7 @@ GEM @@ -191,6 +192,7 @@ GEM
191 rack-accept 192 rack-accept
192 rack-mount 193 rack-mount
193 virtus 194 virtus
  195 + grape-entity (0.2.0)
194 growl (1.0.3) 196 growl (1.0.3)
195 guard (1.5.4) 197 guard (1.5.4)
196 listen (>= 0.4.2) 198 listen (>= 0.4.2)
@@ -481,7 +483,8 @@ DEPENDENCIES @@ -481,7 +483,8 @@ DEPENDENCIES
481 gitlab_omniauth-ldap (= 1.0.2) 483 gitlab_omniauth-ldap (= 1.0.2)
482 gitlab_yaml_db (= 1.0.0) 484 gitlab_yaml_db (= 1.0.0)
483 grack! 485 grack!
484 - grape (~> 0.2.1) 486 + grape (~> 0.3.1)
  487 + grape-entity (~> 0.2.0)
485 grit! 488 grit!
486 grit_ext! 489 grit_ext!
487 growl 490 growl
@@ -9,7 +9,6 @@ module Gitlab @@ -9,7 +9,6 @@ module Gitlab
9 end 9 end
10 10
11 format :json 11 format :json
12 - error_format :json  
13 helpers APIHelpers 12 helpers APIHelpers
14 13
15 mount Groups 14 mount Groups