summaryrefslogtreecommitdiff
path: root/config/routes.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-18 03:08:54 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-18 03:08:54 +0000
commit5ee120f46740efac7b8a460d7a92e4da82f4fb0b (patch)
treeb44d3bef04e9db472913289e6b53e58a14cb3e61 /config/routes.rb
parent72721699f11187199e89631ce0b5e3d2f7c167e9 (diff)
downloadgitlab-ce-5ee120f46740efac7b8a460d7a92e4da82f4fb0b.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/routes.rb')
-rw-r--r--config/routes.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/config/routes.rb b/config/routes.rb
index be0ef0106f4..16b15e5300a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -24,7 +24,8 @@ Rails.application.routes.draw do
use_doorkeeper do
controllers applications: 'oauth/applications',
authorized_applications: 'oauth/authorized_applications',
- authorizations: 'oauth/authorizations'
+ authorizations: 'oauth/authorizations',
+ token_info: 'oauth/token_info'
end
# This prefixless path is required because Jira gets confused if we set it up with a path