Merge branch 'fix/sm/move-callback-route-google_api-auth-callback-for-oauth-under' into 'master'

Move callback route(`google_api/auth/callback`) for Oauth under `-`

Closes #38911

See merge request gitlab-org/gitlab-ce!14802
This commit is contained in:
Kamil Trzciński 2017-10-11 09:55:47 +00:00
commit 1faa97b298
2 changed files with 5 additions and 4 deletions

View File

@ -1,5 +1,7 @@
namespace :google_api do
resource :auth, only: [], controller: :authorizations do
match :callback, via: [:get, :post]
scope '-' do
namespace :google_api do
resource :auth, only: [], controller: :authorizations do
match :callback, via: [:get, :post]
end
end
end

View File

@ -33,7 +33,6 @@ module Gitlab
explore
favicon.ico
files
google_api
groups
health_check
help