diff options
| author | Mario de la Ossa <mariodelaossa@gmail.com> | 2018-08-17 04:05:07 +0300 |
|---|---|---|
| committer | Mario de la Ossa <mariodelaossa@gmail.com> | 2018-08-21 07:20:41 +0300 |
| commit | bf3d1900cb637fc23c002a81a383935c1ea58a0e (patch) | |
| tree | 3fa396845f32f9d2efe1b2b169e04431883a7874 /config/routes.rb | |
| parent | e4e172a221a917e86a83c39daea5f3276377ed63 (diff) | |
Backport of gitlab-org/gitlab-ee!6876
Diffstat (limited to 'config/routes.rb')
| -rw-r--r-- | config/routes.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/config/routes.rb b/config/routes.rb index d16a587c5ee..e2e97b46d23 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -27,6 +27,13 @@ Rails.application.routes.draw do authorizations: 'oauth/authorizations' end + # This is here so we can "reserve" the path for the Jira integration in GitLab EE + # Having a non-existent controller here does not affect the scope in any way since all possible routes + # get a 404 proc returned. It is written in this way to minimize merge conflicts with EE + scope path: '/login/oauth', controller: 'oauth/jira/authorizations', as: :oauth_jira do + match ':action', via: [:get, :post], to: proc { [404, {}, ['']] } + end + use_doorkeeper_openid_connect # Autocomplete |