Download as
Browse Code »

Commit 7c1b8694f5c0624c1d5362a7146e86b221043803

Authored by Jeroen van Baarsen
Committed by Dmitriy Zaporozhets
1 parent 70bb976b
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Upgraded the grape gem

Showing 2 changed files with 4 additions and 4 deletions   Show diff stats
Gemfile
  Diff comments   View file @7c1b869
... ... @@ -48,7 +48,7 @@ gem "gitlab-gollum-lib", "~> 1.0.2", require: 'gollum-lib'
48 48 gem "gitlab-linguist", "~> 2.9.6", require: "linguist"
49 49  
50 50 # API
51   -gem "grape", "~> 0.4.1"
  51 +gem "grape", "~> 0.6.1"
52 52 gem "grape-entity", "~> 0.3.0"
53 53 gem 'rack-cors', require: 'rack/cors'
54 54  
... ...
Gemfile.lock
  Diff comments   View file @7c1b869
... ... @@ -210,7 +210,7 @@ GEM
210 210 omniauth (~> 1.0)
211 211 pyu-ruby-sasl (~> 0.0.3.1)
212 212 rubyntlm (~> 0.1.1)
213   - grape (0.4.1)
  213 + grape (0.6.1)
214 214 activesupport
215 215 builder
216 216 hashie (>= 1.2.0)
... ... @@ -219,7 +219,7 @@ GEM
219 219 rack (>= 1.3.0)
220 220 rack-accept
221 221 rack-mount
222   - virtus
  222 + virtus (>= 1.0.0)
223 223 grape-entity (0.3.0)
224 224 activesupport
225 225 multi_json (>= 1.3.2)
... ... @@ -608,7 +608,7 @@ DEPENDENCIES
608 608 gitlab_meta (= 6.0)
609 609 gitlab_omniauth-ldap (= 1.0.3)
610 610 gon!
611   - grape (~> 0.4.1)
  611 + grape (~> 0.6.1)
612 612 grape-entity (~> 0.3.0)
613 613 growl
614 614 guard-rspec
... ...