diff options
Diffstat (limited to 'config/routes.rb')
| -rw-r--r-- | config/routes.rb | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/config/routes.rb b/config/routes.rb index 82b2ef84a64..80a30372f5a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -31,16 +31,6 @@ InitializerConnections.raise_if_new_database_connection do end put '/oauth/applications/:id/renew(.:format)' => 'oauth/applications#renew', as: :renew_oauth_application - # This prefixless path is required because Jira gets confused if we set it up with a path - # More information: https://gitlab.com/gitlab-org/gitlab/issues/6752 - scope path: '/login/oauth', controller: 'oauth/jira_dvcs/authorizations', as: :oauth_jira_dvcs do - get :authorize, action: :new - get :callback - post :access_token - - match '*all', via: [:get, :post], to: proc { [404, {}, ['']] } - end - draw :oauth use_doorkeeper_openid_connect do @@ -98,6 +88,7 @@ InitializerConnections.raise_if_new_database_connection do get '/autocomplete/projects' => 'autocomplete#projects' get '/autocomplete/award_emojis' => 'autocomplete#award_emojis' get '/autocomplete/merge_request_target_branches' => 'autocomplete#merge_request_target_branches' + get '/autocomplete/merge_request_source_branches' => 'autocomplete#merge_request_source_branches' get '/autocomplete/deploy_keys_with_owners' => 'autocomplete#deploy_keys_with_owners' Gitlab.ee do @@ -229,6 +220,8 @@ InitializerConnections.raise_if_new_database_connection do get '/timelogs' => 'time_tracking/timelogs#index' post '/track_namespace_visits' => 'users/namespace_visits#create' + + get '/external_redirect' => 'external_redirect/external_redirect#index' end # End of the /-/ scope. |