diff options
Diffstat (limited to 'config/routes')
-rw-r--r-- | config/routes/admin.rb | 6 | ||||
-rw-r--r-- | config/routes/group.rb | 5 | ||||
-rw-r--r-- | config/routes/import.rb | 5 | ||||
-rw-r--r-- | config/routes/jira_connect.rb | 1 | ||||
-rw-r--r-- | config/routes/pipelines.rb | 1 | ||||
-rw-r--r-- | config/routes/project.rb | 16 | ||||
-rw-r--r-- | config/routes/snippets.rb | 2 |
7 files changed, 26 insertions, 10 deletions
diff --git a/config/routes/admin.rb b/config/routes/admin.rb index bac8247de2e..84b9829dacf 100644 --- a/config/routes/admin.rb +++ b/config/routes/admin.rb @@ -17,6 +17,7 @@ namespace :admin do put :activate put :unlock put :confirm + put :approve post :impersonate patch :disable_two_factor delete 'remove/:email_id', action: 'remove_email', as: 'remove_email' @@ -81,6 +82,8 @@ namespace :admin do post :preview, on: :collection end + get :instance_review, to: 'instance_review#index' + resource :health_check, controller: 'health_check', only: [:show] resource :background_jobs, controller: 'background_jobs', only: [:show] @@ -91,8 +94,6 @@ namespace :admin do resources :instance_statistics, only: :index resource :dev_ops_report, controller: 'dev_ops_report', only: :show - # remove in 13.5 - get '/dev_ops_score', to: redirect('admin/dev_ops_report') resources :cohorts, only: :index scope(path: 'projects/*namespace_id', @@ -153,6 +154,7 @@ namespace :admin do collection do get :tag_list, format: :json + get :runner_setup_scripts, format: :json end end diff --git a/config/routes/group.rb b/config/routes/group.rb index e5bbfdf7548..33464cf3b55 100644 --- a/config/routes/group.rb +++ b/config/routes/group.rb @@ -17,6 +17,7 @@ constraints(::Constraints::GroupUrlConstrainer.new) do put :transfer, as: :transfer_group # rubocop:disable Cop/PutGroupRoutesUnderScope post :export, as: :export_group # rubocop:disable Cop/PutGroupRoutesUnderScope get :download_export, as: :download_export_group # rubocop:disable Cop/PutGroupRoutesUnderScope + get :unfoldered_environment_names, as: :unfoldered_environment_names_group # rubocop:disable Cop/PutGroupRoutesUnderScope # TODO: Remove as part of refactor in https://gitlab.com/gitlab-org/gitlab-foss/issues/49693 get 'shared', action: :show, as: :group_shared # rubocop:disable Cop/PutGroupRoutesUnderScope @@ -35,6 +36,7 @@ constraints(::Constraints::GroupUrlConstrainer.new) do put :reset_registration_token patch :update_auto_devops post :create_deploy_token, path: 'deploy_token/create', to: 'repository#create_deploy_token' + get :runner_setup_scripts, format: :json end resource :repository, only: [:show], controller: 'repository' do @@ -61,6 +63,7 @@ constraints(::Constraints::GroupUrlConstrainer.new) do resources :milestones, constraints: { id: %r{[^/]+} } do member do + get :issues get :merge_requests get :participants get :labels @@ -85,7 +88,7 @@ constraints(::Constraints::GroupUrlConstrainer.new) do delete :leave, on: :collection end - resources :group_links, only: [:create, :update, :destroy], constraints: { id: /\d+/ } + resources :group_links, only: [:create, :update, :destroy], constraints: { id: /\d+|:id/ } resources :uploads, only: [:create] do collection do diff --git a/config/routes/import.rb b/config/routes/import.rb index 0d3f202ba55..3ee44aa8659 100644 --- a/config/routes/import.rb +++ b/config/routes/import.rb @@ -69,6 +69,11 @@ namespace :import do post :authorize end + resource :bulk_import, only: [:create] do + post :configure + get :status + end + resource :manifest, only: [:create, :new], controller: :manifest do get :status get :realtime_changes diff --git a/config/routes/jira_connect.rb b/config/routes/jira_connect.rb index a3b786b60f0..72b3f04f5e5 100644 --- a/config/routes/jira_connect.rb +++ b/config/routes/jira_connect.rb @@ -5,6 +5,7 @@ namespace :jira_connect do root to: proc { [404, {}, ['']] }, as: 'base' get 'app_descriptor' => 'app_descriptor#show' + get :users, to: 'users#show' namespace :events do post 'installed' diff --git a/config/routes/pipelines.rb b/config/routes/pipelines.rb index 605e82af23a..0fc308b5e65 100644 --- a/config/routes/pipelines.rb +++ b/config/routes/pipelines.rb @@ -7,6 +7,7 @@ resources :pipelines, only: [:index, :new, :create, :show, :destroy] do scope '(*ref)', constraints: { ref: Gitlab::PathRegex.git_reference_regex } do get :latest, action: :show, defaults: { latest: true } end + get :config_variables end member do diff --git a/config/routes/project.rb b/config/routes/project.rb index 24b44646d95..eae217de1ac 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -93,6 +93,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do post :reset_cache put :reset_registration_token post :create_deploy_token, path: 'deploy_token/create', to: 'repository#create_deploy_token' + get :runner_setup_scripts, format: :json end resource :operations, only: [:show, :update] do @@ -161,8 +162,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do resources :milestones, constraints: { id: /\d+/ } do member do post :promote - put :sort_issues - put :sort_merge_requests + get :issues get :merge_requests get :participants get :labels @@ -307,10 +307,14 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do get 'details', on: :member end + resource :tracing, only: [:show] + post 'incidents/integrations/pagerduty', to: 'incident_management/pager_duty_incidents#create' resources :incidents, only: [:index] + get 'issues/incident/:id' => 'incidents#show', as: :issues_incident + namespace :error_tracking do resources :projects, only: :index end @@ -364,16 +368,14 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do resource :jira, only: [:show], controller: :jira end - resources :snippets, concerns: :awardable, constraints: { id: /\d+/ } do + resources :snippets, except: [:create, :update, :destroy], concerns: :awardable, constraints: { id: /\d+/ } do member do get :raw post :mark_as_spam end end - resources :feature_flags, param: :iid do - resources :feature_flag_issues, only: [:index, :create, :destroy], as: 'issues', path: 'issues' - end + resources :feature_flags, param: :iid resource :feature_flags_client, only: [] do post :reset_token end @@ -551,6 +553,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do Gitlab::Routing.redirect_legacy_paths(self, :mirror, :tags, :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) end @@ -575,6 +578,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do get :activity get :refs put :new_issuable_address + get :unfoldered_environment_names end end # rubocop: enable Cop/PutProjectRoutesUnderScope diff --git a/config/routes/snippets.rb b/config/routes/snippets.rb index 7bb82da4910..9e0c42fa07d 100644 --- a/config/routes/snippets.rb +++ b/config/routes/snippets.rb @@ -1,4 +1,4 @@ -resources :snippets, concerns: :awardable do +resources :snippets, except: [:create, :update, :destroy], concerns: :awardable, constraints: { id: /\d+/ } do member do get :raw post :mark_as_spam |