diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-12-16 12:46:12 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-12-16 12:46:12 +0000 |
| commit | 03e26defa6289cdccb05fd31c38190f35a760649 (patch) | |
| tree | 4cd11faab2285790de3f81f249fe53b791a09ee3 /Gemfile.lock | |
| parent | 9c9d23151174fbbcf0b40bd1a223b9b7b60d1342 (diff) | |
| parent | 5886030f08bd41cba22509987fd5b232ec7ec965 (diff) | |
| download | gitlab-ce-03e26defa6289cdccb05fd31c38190f35a760649.tar.gz | |
Merge branch 'gem-update-grape' into 'master'
Update grape to 0.18.0
## What does this MR do?
Update grape to 0.18.0. Required for the settings API.
## What are the relevant issue numbers?
#22928
See merge request !8057
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 7269b528e30..23e45ddc16f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -284,15 +284,15 @@ GEM json multi_json request_store (>= 1.0) - grape (0.15.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 - rack-mount virtus (>= 1.0.0) grape-entity (0.6.0) activesupport @@ -400,6 +400,10 @@ GEM multi_json (1.12.1) multi_xml (0.5.5) multipart-post (2.0.0) + mustermann (0.4.0) + tool (~> 0.2) + mustermann-grape (0.4.0) + mustermann (= 0.4.0) mysql2 (0.3.20) net-ldap (0.12.1) net-ssh (3.0.1) @@ -505,14 +509,12 @@ 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) rack rack-cors (0.4.0) - rack-mount (0.8.3) - rack (>= 1.0.0) rack-oauth2 (1.2.3) activesupport (>= 2.3) attr_required (>= 0.0.5) @@ -743,6 +745,7 @@ GEM tilt (2.0.5) timecop (0.8.1) timfel-krb5-auth (0.8.3) + tool (0.2.3) truncato (0.7.8) htmlentities (~> 4.3.1) nokogiri (~> 1.6.1) @@ -861,7 +864,7 @@ DEPENDENCIES gollum-lib (~> 4.2) gollum-rugged_adapter (~> 0.4.2) gon (~> 6.1.0) - grape (~> 0.15.0) + grape (~> 0.18.0) grape-entity (~> 0.6.0) haml_lint (~> 0.18.2) hamlit (~> 2.6.1) |