diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-21 11:30:04 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-21 11:30:04 +0000 |
| commit | c2437be50c2b8a50bd62f9b376fb45aa44db1825 (patch) | |
| tree | eac9f9827e46225035eab19ee63bd4641da1698b /Gemfile.lock | |
| parent | 1733090a9efd3ee6c3c7e0eb0001602db89a04d7 (diff) | |
| parent | 6b8ad689da393125bb2d1e548211c9a50039b0a7 (diff) | |
| download | gitlab-ce-c2437be50c2b8a50bd62f9b376fb45aa44db1825.tar.gz | |
Merge branch 'dz-update-grape' into 'master'
Update grape gem
See merge request !12992
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 0c4fc1fee0c..83723b6ee9a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -332,13 +332,13 @@ GEM multi_json (~> 1.11) os (~> 0.9) signet (~> 0.7) - grape (0.19.1) + grape (0.19.2) activesupport builder hashie (>= 2.1.0) multi_json (>= 1.3.2) multi_xml (>= 0.5.2) - mustermann-grape (~> 0.4.0) + mustermann-grape (~> 1.0.0) rack (>= 1.3.0) rack-accept virtus (>= 1.0.0) @@ -463,10 +463,9 @@ GEM multi_json (1.12.1) multi_xml (0.6.0) multipart-post (2.0.0) - mustermann (0.4.0) - tool (~> 0.2) - mustermann-grape (0.4.0) - mustermann (= 0.4.0) + mustermann (1.0.0) + mustermann-grape (1.0.0) + mustermann (~> 1.0.0) mysql2 (0.4.5) net-ldap (0.12.1) netrc (0.11.0) @@ -850,7 +849,6 @@ GEM timfel-krb5-auth (0.8.3) toml-rb (0.3.15) citrus (~> 3.0, > 3.0) - tool (0.2.3) truncato (0.7.8) htmlentities (~> 4.3.1) nokogiri (~> 1.6.1) @@ -981,7 +979,7 @@ DEPENDENCIES gollum-rugged_adapter (~> 0.4.4) gon (~> 6.1.0) google-api-client (~> 0.8.6) - grape (~> 0.19.0) + grape (~> 0.19.2) grape-entity (~> 0.6.0) haml_lint (~> 0.21.0) hamlit (~> 2.6.1) |