Commit 3b58fa36 authored by Alex Kalderimis's avatar Alex Kalderimis

Merge branch 'incubation-5mp-google-cloud-fix-google-oauth-cancel-url' into 'master'

Fixup Google OAuth2 return URL

See merge request gitlab-org/gitlab!75902
parents aa4726a8 ebd5baf5
...@@ -54,7 +54,7 @@ class Projects::GoogleCloud::ServiceAccountsController < Projects::GoogleCloud:: ...@@ -54,7 +54,7 @@ class Projects::GoogleCloud::ServiceAccountsController < Projects::GoogleCloud::
return if is_token_valid return if is_token_valid
return_url = project_google_cloud_service_accounts_path(project) return_url = project_google_cloud_index_path(project)
state = generate_session_key_redirect(request.url, return_url) state = generate_session_key_redirect(request.url, return_url)
@authorize_url = GoogleApi::CloudPlatform::Client.new(nil, @authorize_url = GoogleApi::CloudPlatform::Client.new(nil,
callback_google_api_auth_url, callback_google_api_auth_url,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment