Add latest changes from gitlab-org/gitlab@13-0-stable-ee

1 files changed, 6 insertions, 1 deletions

diff --git a/lib/google_api/auth.rb b/lib/google_api/auth.rb
index 56f056fd869..319e5d2063c 100644
--- a/lib/google_api/auth.rb
+++ b/lib/google_api/auth.rb
@@ -37,6 +37,10 @@ module GoogleApi
       Gitlab::Auth::OAuth::Provider.config_for('google_oauth2')
     end
 
+    def client_options
+      config.args.client_options.deep_symbolize_keys
+    end
+
     def client
       return @client if defined?(@client)
 
@@ -49,7 +53,8 @@ module GoogleApi
         config.app_secret,
         site: 'https://accounts.google.com',
         token_url: '/o/oauth2/token',
-        authorize_url: '/o/oauth2/auth'
+        authorize_url: '/o/oauth2/auth',
+        **client_options
       )
     end
   end