diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-03-19 17:58:04 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-03-19 17:58:04 +0000 |
| commit | ec41bd600ac180d9bb1f3a749ca82673cfb2097f (patch) | |
| tree | 8beeef999e2af0dfa89c1da61b250a79fe459b9a | |
| parent | 7f81a324ed75f49f624d1112033d79fcd522d249 (diff) | |
| parent | c2dc539f4c42e3d91adde52443939c5e58fd3802 (diff) | |
| download | gitlab-ce-ec41bd600ac180d9bb1f3a749ca82673cfb2097f.tar.gz | |
Merge branch 'update-google-api-client' into 'master'
Update google-api-client 0.13.6 -. 0.19.8
See merge request gitlab-org/gitlab-ce!17790
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 8 |
2 files changed, 5 insertions, 5 deletions
@@ -113,7 +113,7 @@ gem 'fog-rackspace', '~> 0.1.1' gem 'fog-aliyun', '~> 0.2.0' # for Google storage -gem 'google-api-client', '~> 0.13.6' +gem 'google-api-client', '~> 0.19.8' # for aws storage gem 'unf', '~> 0.1.4' diff --git a/Gemfile.lock b/Gemfile.lock index 817772dfdcb..8a37b3c4152 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -336,9 +336,9 @@ GEM json multi_json request_store (>= 1.0) - google-api-client (0.13.6) + google-api-client (0.19.8) addressable (~> 2.5, >= 2.5.1) - googleauth (~> 0.5) + googleauth (>= 0.5, < 0.7.0) httpclient (>= 2.8.1, < 3.0) mime-types (~> 3.0) representable (~> 3.0) @@ -415,7 +415,7 @@ GEM httparty (0.13.7) json (~> 1.8) multi_xml (>= 0.5.2) - httpclient (2.8.2) + httpclient (2.8.3) i18n (0.9.5) concurrent-ruby (~> 1.0) ice_nine (0.11.2) @@ -1067,7 +1067,7 @@ DEPENDENCIES gollum-lib (~> 4.2) gollum-rugged_adapter (~> 0.4.4) gon (~> 6.1.0) - google-api-client (~> 0.13.6) + google-api-client (~> 0.19.8) google-protobuf (= 3.5.1) gpgme grape (~> 1.0) |