diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-10-11 09:55:47 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-10-11 09:55:47 +0000 |
| commit | 1faa97b298d31a982c5dfa7049a04569b67cf3f2 (patch) | |
| tree | 1ea2227f53221338b7876bc747b88a3749dc2c2d | |
| parent | a11077e9d3d6f8c588371facd847bb77868b1e68 (diff) | |
| parent | 1f14e9c2bc138a8d791af8d7c2a916c8bb4320ff (diff) | |
| download | gitlab-ce-1faa97b298d31a982c5dfa7049a04569b67cf3f2.tar.gz | |
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
| -rw-r--r-- | config/routes/google_api.rb | 8 | ||||
| -rw-r--r-- | lib/gitlab/path_regex.rb | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/config/routes/google_api.rb b/config/routes/google_api.rb index 3fb236d3d51..a119b47c176 100644 --- a/config/routes/google_api.rb +++ b/config/routes/google_api.rb @@ -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 diff --git a/lib/gitlab/path_regex.rb b/lib/gitlab/path_regex.rb index e68160c8faf..7c02c9c5c48 100644 --- 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 |