diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-05-10 15:50:13 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-05-10 15:50:13 +0000 |
| commit | 0afcfd31bdf8d23bc180d5a36796aba8e66dbd33 (patch) | |
| tree | 244fec92897cf812be04feb9c14fe3e69de9dfa7 /Gemfile.lock | |
| parent | f667bbceaba7556d5fb2adadce4b7d170b914e8a (diff) | |
| parent | 3fe6ddbe1ab9c480f353fa139ec6020c17e8e3cb (diff) | |
| download | gitlab-ce-0afcfd31bdf8d23bc180d5a36796aba8e66dbd33.tar.gz | |
Merge branch 'update-gon' into 'master'
Update gon ~> 6.1.0 to ~> 6.2
See merge request gitlab-org/gitlab-ce!18764
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 201dba5fc5a..6028ce32d2f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -332,9 +332,8 @@ GEM activesupport (>= 4.2.0) gollum-grit_adapter (1.0.1) gitlab-grit (~> 2.7, >= 2.7.1) - gon (6.1.0) + gon (6.2.0) actionpack (>= 3.0) - json multi_json request_store (>= 1.0) google-api-client (0.19.8) @@ -1065,7 +1064,7 @@ DEPENDENCIES gitlab-markup (~> 1.6.2) gitlab-styles (~> 2.3) gitlab_omniauth-ldap (~> 2.0.4) - gon (~> 6.1.0) + gon (~> 6.2) google-api-client (~> 0.19.8) google-protobuf (= 3.5.1) gpgme |