From 3d4ae06a6071eb859370532ce49ed09a5884cc3e Mon Sep 17 00:00:00 2001
From: Michael Kozono <mkozono@gmail.com>
Date: Fri, 6 Jul 2018 10:51:45 -0700
Subject: Bump fog-google to resolve 48922

---
 Gemfile             |  4 ++--
 Gemfile.lock        | 12 ++++++------
 Gemfile.rails5.lock | 10 +++++-----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Gemfile b/Gemfile
index d575568adaa..6e74636856b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -116,14 +116,14 @@ gem 'dropzonejs-rails', '~> 0.7.1'
 # for backups
 gem 'fog-aws', '~> 2.0.1'
 gem 'fog-core', '~> 1.44'
-gem 'fog-google', '~> 1.3.3'
+gem 'fog-google', '~> 1.6.0'
 gem 'fog-local', '~> 0.3'
 gem 'fog-openstack', '~> 0.1'
 gem 'fog-rackspace', '~> 0.1.1'
 gem 'fog-aliyun', '~> 0.2.0'
 
 # for Google storage
-gem 'google-api-client', '~> 0.19.8'
+gem 'google-api-client', '~> 0.23.1'
 
 # for aws storage
 gem 'unf', '~> 0.1.4'
diff --git a/Gemfile.lock b/Gemfile.lock
index 1b8a777ceb4..79b82ba31af 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -237,11 +237,11 @@ GEM
       builder
       excon (~> 0.58)
       formatador (~> 0.2)
-    fog-google (1.3.3)
+    fog-google (1.6.0)
       fog-core
       fog-json
       fog-xml
-      google-api-client (~> 0.19.1)
+      google-api-client (~> 0.23.0)
     fog-json (1.0.2)
       fog-core (~> 1.0)
       multi_json (~> 1.10)
@@ -329,7 +329,7 @@ GEM
       actionpack (>= 3.0)
       multi_json
       request_store (>= 1.0)
-    google-api-client (0.19.8)
+    google-api-client (0.23.1)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.5, < 0.7.0)
       httpclient (>= 2.8.1, < 3.0)
@@ -733,7 +733,7 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    retriable (3.1.1)
+    retriable (3.1.2)
     rinku (2.0.0)
     rotp (2.1.2)
     rouge (3.1.1)
@@ -1025,7 +1025,7 @@ DEPENDENCIES
   fog-aliyun (~> 0.2.0)
   fog-aws (~> 2.0.1)
   fog-core (~> 1.44)
-  fog-google (~> 1.3.3)
+  fog-google (~> 1.6.0)
   fog-local (~> 0.3)
   fog-openstack (~> 0.1)
   fog-rackspace (~> 0.1.1)
@@ -1046,7 +1046,7 @@ DEPENDENCIES
   gitlab-styles (~> 2.4)
   gitlab_omniauth-ldap (~> 2.0.4)
   gon (~> 6.2)
-  google-api-client (~> 0.19.8)
+  google-api-client (~> 0.23.1)
   google-protobuf (= 3.5.1)
   gpgme
   grape (~> 1.0)
diff --git a/Gemfile.rails5.lock b/Gemfile.rails5.lock
index 766f2479ea5..ab388f01b48 100644
--- a/Gemfile.rails5.lock
+++ b/Gemfile.rails5.lock
@@ -240,11 +240,11 @@ GEM
       builder
       excon (~> 0.58)
       formatador (~> 0.2)
-    fog-google (1.3.3)
+    fog-google (1.6.0)
       fog-core
       fog-json
       fog-xml
-      google-api-client (~> 0.19.1)
+      google-api-client (~> 0.23.0)
     fog-json (1.0.2)
       fog-core (~> 1.0)
       multi_json (~> 1.10)
@@ -332,7 +332,7 @@ GEM
       actionpack (>= 3.0)
       multi_json
       request_store (>= 1.0)
-    google-api-client (0.19.8)
+    google-api-client (0.23.1)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.5, < 0.7.0)
       httpclient (>= 2.8.1, < 3.0)
@@ -1035,7 +1035,7 @@ DEPENDENCIES
   fog-aliyun (~> 0.2.0)
   fog-aws (~> 2.0.1)
   fog-core (~> 1.44)
-  fog-google (~> 1.3.3)
+  fog-google (~> 1.6.0)
   fog-local (~> 0.3)
   fog-openstack (~> 0.1)
   fog-rackspace (~> 0.1.1)
@@ -1056,7 +1056,7 @@ DEPENDENCIES
   gitlab-styles (~> 2.4)
   gitlab_omniauth-ldap (~> 2.0.4)
   gon (~> 6.2)
-  google-api-client (~> 0.19.8)
+  google-api-client (~> 0.23.1)
   google-protobuf (= 3.5.1)
   gpgme
   grape (~> 1.0)
-- 
cgit v1.2.1