Commit 1faa97b2 authored by Kamil Trzciński's avatar Kamil Trzciński

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
parents a11077e9 1f14e9c2
namespace :google_api do
scope '-' do
namespace :google_api do
resource :auth, only: [], controller: :authorizations do
match :callback, via: [:get, :post]
end
end
end
......@@ -33,7 +33,6 @@ module Gitlab
explore
favicon.ico
files
google_api
groups
health_check
help
......
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