diff options
Diffstat (limited to 'config/routes.rb')
-rw-r--r-- | config/routes.rb | 48 |
1 files changed, 14 insertions, 34 deletions
diff --git a/config/routes.rb b/config/routes.rb index 3b0370551b9..f18085dbb54 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -44,6 +44,14 @@ Rails.application.routes.draw do draw :oauth use_doorkeeper_openid_connect + # Add OPTIONS method for CORS preflight requests + match '/oauth/userinfo' => 'doorkeeper/openid_connect/userinfo#show', via: :options + match '/oauth/discovery/keys' => 'doorkeeper/openid_connect/discovery#keys', via: :options + match '/.well-known/openid-configuration' => 'doorkeeper/openid_connect/discovery#provider', via: :options + match '/.well-known/webfinger' => 'doorkeeper/openid_connect/discovery#webfinger', via: :options + + match '/oauth/token' => 'oauth/tokens#create', via: :options + match '/oauth/revoke' => 'oauth/tokens#revoke', via: :options # Sign up scope path: '/users/sign_up', module: :registrations, as: :users_sign_up do @@ -252,38 +260,6 @@ Rails.application.routes.draw do end end - # Deprecated routes. - # Will be removed as part of https://gitlab.com/gitlab-org/gitlab/-/issues/210024 - scope as: :deprecated do - # Autocomplete - get '/autocomplete/users' => 'autocomplete#users' - get '/autocomplete/users/:id' => 'autocomplete#user' - get '/autocomplete/projects' => 'autocomplete#projects' - get '/autocomplete/award_emojis' => 'autocomplete#award_emojis' - get '/autocomplete/merge_request_target_branches' => 'autocomplete#merge_request_target_branches' - - Gitlab.ee do - get '/autocomplete/project_groups' => 'autocomplete#project_groups' - get '/autocomplete/project_routes' => 'autocomplete#project_routes' - get '/autocomplete/namespace_routes' => 'autocomplete#namespace_routes' - end - - resources :invites, only: [:show], constraints: { id: /[A-Za-z0-9_-]+/ } do - member do - post :accept - match :decline, via: [:get, :post] - end - end - - resources :sent_notifications, only: [], constraints: { id: /\h{32}/ } do - member do - get :unsubscribe - end - end - - resources :abuse_reports, only: [:new, :create] - end - resources :groups, only: [:index, :new, :create] do post :preview_markdown end @@ -311,9 +287,13 @@ Rails.application.routes.draw do # Issue https://gitlab.com/gitlab-org/gitlab/-/issues/210024 scope as: 'deprecated' do - draw :snippets + # Issue https://gitlab.com/gitlab-org/gitlab/-/issues/223719 + get '/snippets/:id/raw', + to: 'snippets#raw', + format: false, + constraints: { id: /\d+/ } - Gitlab::Routing.redirect_legacy_paths(self, :profile) + Gitlab::Routing.redirect_legacy_paths(self, :snippets) end Gitlab.ee do |