diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-10-11 09:55:47 +0000 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-10-11 23:07:46 +0800 |
| commit | 5f2901bf5b56caa3adfa3f63c87a68db4d2dd184 (patch) | |
| tree | b874e352591aafa9e5f1ca627b8433decec95cf9 /config/routes/google_api.rb | |
| parent | e451e7a16db4da4e2b01ebe64b0b9afc541a3829 (diff) | |
| download | gitlab-ce-5f2901bf5b56caa3adfa3f63c87a68db4d2dd184.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
Diffstat (limited to 'config/routes/google_api.rb')
| -rw-r--r-- | config/routes/google_api.rb | 8 |
1 files changed, 5 insertions, 3 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 |