Backport of gitlab-org/gitlab-ee!6876ce-6752-jira-branches

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