diff options
| author | Connor Shea <connor.james.shea@gmail.com> | 2016-11-14 13:16:11 -0700 |
|---|---|---|
| committer | Connor Shea <connor.james.shea@gmail.com> | 2016-12-13 18:54:39 -0700 |
| commit | 92fc31722f201a905e69c34be0cbfd37ecd25d2f (patch) | |
| tree | 424ba55b044d308c3b14159e5298d2e248bead14 | |
| parent | de3e9eed5ee38ff82931153c4bd59d4ba571663d (diff) | |
| download | gitlab-ce-92fc31722f201a905e69c34be0cbfd37ecd25d2f.tar.gz | |
Update Grape to master.cs-upgrade-grape-again
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 35 |
2 files changed, 21 insertions, 16 deletions
@@ -67,7 +67,7 @@ gem 'gollum-rugged_adapter', '~> 0.4.2', require: false gem 'github-linguist', '~> 4.7.0', require: 'linguist' # API -gem 'grape', '~> 0.18.0' +gem 'grape', git: 'https://github.com/ruby-grape/grape.git' gem 'grape-entity', '~> 0.6.0' gem 'rack-cors', '~> 0.4.0', require: 'rack/cors' diff --git a/Gemfile.lock b/Gemfile.lock index 574c6a3aa61..c7b66ba73c1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,18 @@ +GIT + remote: https://github.com/ruby-grape/grape.git + revision: a3a28f5b5dfbb2797442e006dbffd750b27f2a76 + specs: + grape (0.18.1) + activesupport + builder + hashie (>= 2.1.0) + multi_json (>= 1.3.2) + multi_xml (>= 0.5.2) + mustermann-grape (~> 0.4.0) + rack (>= 1.3.0) + rack-accept + virtus (>= 1.0.0) + GEM remote: https://rubygems.org/ specs: @@ -282,16 +297,6 @@ GEM json multi_json request_store (>= 1.0) - grape (0.18.0) - activesupport - builder - hashie (>= 2.1.0) - multi_json (>= 1.3.2) - multi_xml (>= 0.5.2) - mustermann-grape (~> 0.4.0) - rack (>= 1.3.0) - rack-accept - virtus (>= 1.0.0) grape-entity (0.6.0) activesupport multi_json (>= 1.3.2) @@ -306,7 +311,7 @@ GEM temple (~> 0.7.6) thor tilt - hashie (3.4.4) + hashie (3.4.6) health_check (2.2.1) rails (>= 4.0) hipchat (1.5.2) @@ -323,7 +328,7 @@ GEM multi_xml (>= 0.5.2) httpclient (2.8.2) i18n (0.7.0) - ice_nine (0.11.1) + ice_nine (0.11.2) influxdb (0.2.3) cause json @@ -383,7 +388,7 @@ GEM minitest (5.7.0) mousetrap-rails (1.4.6) multi_json (1.12.1) - multi_xml (0.5.5) + multi_xml (0.6.0) multipart-post (2.0.0) mustermann (0.4.0) tool (~> 0.2) @@ -493,7 +498,7 @@ GEM pry-rails (0.3.4) pry (>= 0.9.10) pyu-ruby-sasl (0.0.3.3) - rack (1.6.4) + rack (1.6.5) rack-accept (0.4.5) rack (>= 0.4) rack-attack (4.4.1) @@ -843,7 +848,7 @@ DEPENDENCIES gollum-lib (~> 4.2) gollum-rugged_adapter (~> 0.4.2) gon (~> 6.1.0) - grape (~> 0.18.0) + grape! grape-entity (~> 0.6.0) haml_lint (~> 0.18.2) hamlit (~> 2.6.1) |