diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-10-05 17:41:36 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-10-05 17:44:11 +0200 |
| commit | 0fbe0406fd7ced45939c79bcdd1fcbac08ddfa1b (patch) | |
| tree | f8b5f9d7b3a0af7601df530f2081aeac214b8a4d | |
| parent | 2178cd44c59effb67cef0743064a75f5073c9f45 (diff) | |
| download | gitlab-ce-0fbe0406fd7ced45939c79bcdd1fcbac08ddfa1b.tar.gz | |
Change `/google_api/authorizations/` to `/google_api/auth/`.
| -rw-r--r-- | app/controllers/google_api/authorizations_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/projects/clusters_controller.rb | 2 | ||||
| -rw-r--r-- | config/routes/google_api.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/google_api/authorizations_controller.rb b/app/controllers/google_api/authorizations_controller.rb index 79f49d598af..e4f76fb493e 100644 --- a/app/controllers/google_api/authorizations_controller.rb +++ b/app/controllers/google_api/authorizations_controller.rb @@ -2,7 +2,7 @@ module GoogleApi class AuthorizationsController < ApplicationController def callback token, expires_at = GoogleApi::CloudPlatform::Client - .new(nil, callback_google_api_authorizations_url) + .new(nil, callback_google_api_auth_url) .get_token(params[:code]) session[GoogleApi::CloudPlatform::Client.session_key_for_token] = token diff --git a/app/controllers/projects/clusters_controller.rb b/app/controllers/projects/clusters_controller.rb index 8c0fbf72aca..bd286b87a29 100644 --- a/app/controllers/projects/clusters_controller.rb +++ b/app/controllers/projects/clusters_controller.rb @@ -17,7 +17,7 @@ class Projects::ClustersController < Projects::ApplicationController def login begin @authorize_url = GoogleApi::CloudPlatform::Client.new( - nil, callback_google_api_authorizations_url, + nil, callback_google_api_auth_url, state: namespace_project_clusters_url.to_s).authorize_url rescue GoogleApi::Auth::ConfigMissingError # no-op diff --git a/config/routes/google_api.rb b/config/routes/google_api.rb index 57e15d0d39c..3fb236d3d51 100644 --- a/config/routes/google_api.rb +++ b/config/routes/google_api.rb @@ -1,5 +1,5 @@ namespace :google_api do - resource :authorizations, only: [], controller: :authorizations do + resource :auth, only: [], controller: :authorizations do match :callback, via: [:get, :post] end end |