diff options
| author | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2013-12-09 20:50:36 +0100 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-10 12:11:28 +0200 |
| commit | 7c1b8694f5c0624c1d5362a7146e86b221043803 (patch) | |
| tree | 5a79b94749afa442621728c9699824e51dda725b | |
| parent | 70bb976bc61c9cd209bbf67520426166664bb539 (diff) | |
| download | gitlab-ce-7c1b8694f5c0624c1d5362a7146e86b221043803.tar.gz | |
Upgraded the grape gem
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 6 |
2 files changed, 4 insertions, 4 deletions
@@ -48,7 +48,7 @@ gem "gitlab-gollum-lib", "~> 1.0.2", require: 'gollum-lib' gem "gitlab-linguist", "~> 2.9.6", require: "linguist" # API -gem "grape", "~> 0.4.1" +gem "grape", "~> 0.6.1" gem "grape-entity", "~> 0.3.0" gem 'rack-cors', require: 'rack/cors' diff --git a/Gemfile.lock b/Gemfile.lock index 8d9aa401fb2..dac2f85ce26 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -210,7 +210,7 @@ GEM omniauth (~> 1.0) pyu-ruby-sasl (~> 0.0.3.1) rubyntlm (~> 0.1.1) - grape (0.4.1) + grape (0.6.1) activesupport builder hashie (>= 1.2.0) @@ -219,7 +219,7 @@ GEM rack (>= 1.3.0) rack-accept rack-mount - virtus + virtus (>= 1.0.0) grape-entity (0.3.0) activesupport multi_json (>= 1.3.2) @@ -608,7 +608,7 @@ DEPENDENCIES gitlab_meta (= 6.0) gitlab_omniauth-ldap (= 1.0.3) gon! - grape (~> 0.4.1) + grape (~> 0.6.1) grape-entity (~> 0.3.0) growl guard-rspec |