diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2015-11-24 15:36:36 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-11-24 15:36:36 -0500 |
| commit | 776027e4c7a4e7ff5df18e92cd79461a7d5de73e (patch) | |
| tree | 7702eadea0b31a43e77957cb771a6b712c69b511 /Gemfile.lock | |
| parent | 9ab2e5f516054921860fc62fe2c68d47123c55ef (diff) | |
| download | gitlab-ce-776027e4c7a4e7ff5df18e92cd79461a7d5de73e.tar.gz | |
Bump gon to ~> 6.0.1rs-update-gon
Closes #2856
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 448941cfc8d..70c532f05de 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -312,9 +312,11 @@ GEM rouge (~> 1.10.1) sanitize (~> 2.1.0) stringex (~> 2.5.1) - gon (5.0.4) - actionpack (>= 2.3.0) + gon (6.0.1) + actionpack (>= 3.0) json + multi_json + request_store (>= 1.0) grape (0.13.0) activesupport builder @@ -846,7 +848,7 @@ DEPENDENCIES gitlab_meta (= 7.0) gitlab_omniauth-ldap (~> 1.2.1) gollum-lib (~> 4.0.2) - gon (~> 5.0.0) + gon (~> 6.0.1) grape (~> 0.13.0) grape-entity (~> 0.4.2) haml-rails (~> 0.9.0) |