diff options
Diffstat (limited to 'config/routes')
-rw-r--r-- | config/routes/admin.rb | 3 | ||||
-rw-r--r-- | config/routes/group.rb | 9 | ||||
-rw-r--r-- | config/routes/project.rb | 42 | ||||
-rw-r--r-- | config/routes/user.rb | 4 |
4 files changed, 26 insertions, 32 deletions
diff --git a/config/routes/admin.rb b/config/routes/admin.rb index 8148e92d0e5..bbf00cd0b00 100644 --- a/config/routes/admin.rb +++ b/config/routes/admin.rb @@ -61,7 +61,7 @@ namespace :admin do end end - resources :topics, only: [:index, :new, :create, :edit, :update] do + resources :topics, only: [:index, :new, :create, :edit, :update, :destroy] do resource :avatar, controller: 'topics/avatars', only: [:destroy] collection do post :preview_markdown @@ -138,6 +138,7 @@ namespace :admin do get :usage_data put :reset_registration_token put :reset_health_check_token + put :reset_error_tracking_access_token put :clear_repository_check_states match :general, :integrations, :repository, :ci_cd, :reporting, :metrics_and_profiling, :network, :preferences, via: [:get, :patch] get :lets_encrypt_terms_of_service diff --git a/config/routes/group.rb b/config/routes/group.rb index bf6094ff2f1..2a5931207b0 100644 --- a/config/routes/group.rb +++ b/config/routes/group.rb @@ -118,10 +118,17 @@ constraints(::Constraints::GroupUrlConstrainer.new) do end resources :container_registries, only: [:index, :show], controller: 'registry/repositories' - resources :harbor_registries, only: [:index, :show], controller: 'harbor/repositories' resource :dependency_proxy, only: [:show, :update] resources :email_campaigns, only: :index + namespace :harbor do + resources :repositories, only: [:index] do + resources :artifacts, only: [:index] do + resources :tags, only: [:index] + end + end + end + resources :autocomplete_sources, only: [] do collection do get 'members' diff --git a/config/routes/project.rb b/config/routes/project.rb index afc06780471..5eb0b9396c9 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -221,20 +221,6 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do end end - # Legacy routes for `/-/integrations` which are now in `/-/settings/integrations`. - # Can be removed in 15.2, see https://gitlab.com/gitlab-org/gitlab/-/issues/334846 - resources :integrations, controller: 'settings/integrations', constraints: { id: %r{[^/]+} }, only: [:edit, :update] do - member do - put :test - end - - resources :hook_logs, only: [:show], controller: 'settings/integration_hook_logs' do - member do - post :retry - end - end - end - resources :boards, only: [:index, :show, :create, :update, :destroy], constraints: { id: /\d+/ } do collection do get :recent @@ -252,13 +238,6 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do end end - resources :logs, only: [:index] do - collection do - get :k8s - get :elasticsearch - end - end - resources :starrers, only: [:index] resources :forks, only: [:index, :new, :create] resources :group_links, only: [:update, :destroy], constraints: { id: /\d+|:id/ } @@ -319,15 +298,18 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do resources :terraform, only: [:index] - resources :google_cloud, only: [:index] - namespace :google_cloud do + get '/configuration', to: 'configuration#index' + resources :revoke_oauth, only: [:create] resources :service_accounts, only: [:index, :create] resources :gcp_regions, only: [:index, :create] + get '/deployments', to: 'deployments#index' get '/deployments/cloud_run', to: 'deployments#cloud_run' get '/deployments/cloud_storage', to: 'deployments#cloud_storage' + + get '/databases', to: 'databases#index' end resources :environments, except: [:destroy] do @@ -377,8 +359,6 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do get 'work_items/*work_items_path' => 'work_items#index', as: :work_items - resource :tracing, only: [:show] - post 'incidents/integrations/pagerduty', to: 'incident_management/pager_duty_incidents#create' resources :incidents, only: [:index] @@ -480,6 +460,14 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do end end end + + namespace :harbor do + resources :repositories, only: [:index, :show] do + resources :artifacts, only: [:index] do + resources :tags, only: [:index] + end + end + end end # End of the /-/ scope. @@ -546,9 +534,6 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do resources :container_registry, only: [:index, :destroy, :show], # rubocop: disable Cop/PutProjectRoutesUnderScope controller: 'registry/repositories' - resources :harbor_registry, only: [:index, :show], # rubocop: disable Cop/PutProjectRoutesUnderScope - controller: 'harbor/repositories' - namespace :registry do resources :repository, only: [] do # rubocop: disable Cop/PutProjectRoutesUnderScope # We default to JSON format in the controller to avoid ambiguity. @@ -638,7 +623,6 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do :commits, :commit, :find_file, :files, :compare, :cycle_analytics, :mattermost, :variables, :triggers, :environments, :protected_environments, :error_tracking, :alert_management, - :tracing, :serverless, :clusters, :audit_events, :wikis, :merge_requests, :vulnerability_feedback, :security, :dependencies, :issues, :pipelines, :pipeline_schedules, :runners, :snippets) diff --git a/config/routes/user.rb b/config/routes/user.rb index ccacf817cc5..96e8c850da4 100644 --- a/config/routes/user.rb +++ b/config/routes/user.rb @@ -15,7 +15,7 @@ end # Use custom controller for LDAP omniauth callback if Gitlab::Auth::Ldap::Config.sign_in_enabled? devise_scope :user do - Gitlab::Auth::Ldap::Config.available_servers.each do |server| + Gitlab::Auth::Ldap::Config.servers.each do |server| override_omniauth(server['provider_name'], 'ldap/omniauth_callbacks') end end @@ -53,6 +53,8 @@ end devise_scope :user do get '/users/almost_there' => 'confirmations#almost_there' + post '/users/resend_verification_code', to: 'sessions#resend_verification_code' + get '/users/successful_verification', to: 'sessions#successful_verification' end scope '-/users', module: :users do |