summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConnor Shea <connor.james.shea@gmail.com>2017-02-23 14:06:40 -0700
committerConnor Shea <connor.james.shea@gmail.com>2017-02-23 14:07:36 -0700
commita36fce76a7493b24d284af1e72d917aca7755e48 (patch)
tree95cb235e9f7eeb85b1302c1c75ab09bd583ef76f
parent509ff2ab170802e23646282f1d146a6383b53a66 (diff)
downloadgitlab-ce-cs-update-google-api-client.tar.gz
Update google-api-client from 0.8.6 to 0.9.28.cs-update-google-api-client
Changelog: https://github.com/google/google-api-ruby-client/blob/cf38f15a087cc660ff2278d15bfccdb3b01e1bf0/CHANGELOG.md#0928 Necessary for Rails 5.
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock31
2 files changed, 15 insertions, 18 deletions
diff --git a/Gemfile b/Gemfile
index 8715acba24f..e0bcfef57b9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -93,7 +93,7 @@ gem 'fog-openstack', '~> 0.1'
gem 'fog-rackspace', '~> 0.1.1'
# for Google storage
-gem 'google-api-client', '~> 0.8.6'
+gem 'google-api-client', '~> 0.9.28'
# for aws storage
gem 'unf', '~> 0.1.4'
diff --git a/Gemfile.lock b/Gemfile.lock
index b46b09c7544..6f5b33f92fd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -59,10 +59,6 @@ GEM
attr_encrypted (3.0.3)
encryptor (~> 3.0.0)
attr_required (1.0.0)
- autoparse (0.3.3)
- addressable (>= 2.3.1)
- extlib (>= 0.9.15)
- multi_json (>= 1.0.0)
autoprefixer-rails (6.2.3)
execjs
json
@@ -180,7 +176,6 @@ GEM
excon (0.52.0)
execjs (2.6.0)
expression_parser (0.9.0)
- extlib (0.9.16)
factory_girl (4.7.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.7.0)
@@ -285,17 +280,15 @@ GEM
json
multi_json
request_store (>= 1.0)
- google-api-client (0.8.7)
- activesupport (>= 3.2, < 5.0)
+ google-api-client (0.9.28)
addressable (~> 2.3)
- autoparse (~> 0.3)
- extlib (~> 0.9)
- faraday (~> 0.9)
- googleauth (~> 0.3)
- launchy (~> 2.4)
- multi_json (~> 1.10)
- retriable (~> 1.4)
- signet (~> 0.6)
+ googleauth (~> 0.5)
+ httpclient (~> 2.7)
+ hurley (~> 0.1)
+ memoist (~> 0.11)
+ mime-types (>= 1.6)
+ representable (~> 2.3.0)
+ retriable (~> 2.0)
googleauth (0.5.1)
faraday (~> 0.9)
jwt (~> 1.4)
@@ -353,6 +346,7 @@ GEM
json (~> 1.8)
multi_xml (>= 0.5.2)
httpclient (2.8.2)
+ hurley (0.2)
i18n (0.8.0)
ice_nine (0.11.1)
influxdb (0.2.3)
@@ -599,6 +593,8 @@ GEM
redis-store (~> 1.2.0)
redis-store (1.2.0)
redis (>= 2.2)
+ representable (2.3.0)
+ uber (~> 0.0.7)
request_store (1.3.1)
responders (2.3.0)
railties (>= 4.2.0, < 5.1)
@@ -606,7 +602,7 @@ GEM
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
- retriable (1.4.1)
+ retriable (2.1.0)
rinku (2.0.0)
rotp (2.1.2)
rouge (2.0.7)
@@ -769,6 +765,7 @@ GEM
tzinfo (1.2.2)
thread_safe (~> 0.1)
u2f (0.2.1)
+ uber (0.0.15)
uglifier (2.7.2)
execjs (>= 0.3.0)
json (>= 1.8.0)
@@ -885,7 +882,7 @@ DEPENDENCIES
gollum-lib (~> 4.2)
gollum-rugged_adapter (~> 0.4.2)
gon (~> 6.1.0)
- google-api-client (~> 0.8.6)
+ google-api-client (~> 0.9.28)
grape (~> 0.18.0)
grape-entity (~> 0.6.0)
haml_lint (~> 0.21.0)