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

Merge branch 'fix/sm/move-callback-route-google_api-auth-callback-for-oauth-under' into 'master'
1faa97b2 · Kamil Trzciński · a11077e9 · 1f14e9c2 · 1faa97b2 · 1faa97b2
Commit 1faa97b2 authored Oct 11, 2017 by Kamil Trzciński
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

google_api.rb config/routes/google_api.rb +3 -1

path_regex.rb lib/gitlab/path_regex.rb +0 -1

No files found.
--- a/config/routes/google_api.rb
+++ b/config/routes/google_api.rb
-namespace :google_api do
+scope '-' do
+  namespace :google_api do
    resource :auth, only: [], controller: :authorizations do
      match :callback, via: [:get, :post]
    end
+  end
 end
--- a/lib/gitlab/path_regex.rb
+++ b/lib/gitlab/path_regex.rb
@@ -33,7 +33,6 @@ module Gitlab
      explore
      favicon.ico
      files
-      google_api
      groups
      health_check
      help