Add latest changes from gitlab-org/gitlab@master

1 files changed, 2 insertions, 1 deletions

diff --git a/config/routes.rb b/config/routes.rb
index fa84b5e50c7..b1ab4ec6bab 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -25,7 +25,8 @@ Rails.application.routes.draw do
     controllers applications: 'oauth/applications',
                 authorized_applications: 'oauth/authorized_applications',
                 authorizations: 'oauth/authorizations',
-                token_info: 'oauth/token_info'
+                token_info: 'oauth/token_info',
+                tokens: 'oauth/tokens'
   end
 
   # This prefixless path is required because Jira gets confused if we set it up with a path