diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 18:44:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 18:44:42 +0300 |
commit | 4555e1b21c365ed8303ffb7a3325d773c9b8bf31 (patch) | |
tree | 5423a1c7516cffe36384133ade12572cf709398d /config/routes | |
parent | e570267f2f6b326480d284e0164a6464ba4081bc (diff) |
Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42
Diffstat (limited to 'config/routes')
-rw-r--r-- | config/routes/admin.rb | 8 | ||||
-rw-r--r-- | config/routes/group.rb | 13 | ||||
-rw-r--r-- | config/routes/pipelines.rb | 1 | ||||
-rw-r--r-- | config/routes/project.rb | 11 |
4 files changed, 32 insertions, 1 deletions
diff --git a/config/routes/admin.rb b/config/routes/admin.rb index 39d639a70cc..2ba00e3bf66 100644 --- a/config/routes/admin.rb +++ b/config/routes/admin.rb @@ -10,11 +10,19 @@ namespace :admin do end end + collection do + scope '/-/' do + get :cohorts + end + end + member do get :projects get :keys put :block put :unblock + put :ban + put :unban put :deactivate put :activate put :unlock diff --git a/config/routes/group.rb b/config/routes/group.rb index 126680a0b44..ef31b639d33 100644 --- a/config/routes/group.rb +++ b/config/routes/group.rb @@ -52,7 +52,7 @@ constraints(::Constraints::GroupUrlConstrainer.new) do resources :applications - resources :packages_and_registries, only: [:index] + resource :packages_and_registries, only: [:show] end resource :variables, only: [:show, :update] @@ -114,6 +114,17 @@ constraints(::Constraints::GroupUrlConstrainer.new) do resources :container_registries, only: [:index, :show], controller: 'registry/repositories' resource :dependency_proxy, only: [:show, :update] resources :email_campaigns, only: :index + + resources :autocomplete_sources, only: [] do + collection do + get 'members' + get 'issues' + get 'merge_requests' + get 'labels' + get 'commands' + get 'milestones' + end + end end scope(path: '*id', diff --git a/config/routes/pipelines.rb b/config/routes/pipelines.rb index 1a74abdeaa1..ef390d7988b 100644 --- a/config/routes/pipelines.rb +++ b/config/routes/pipelines.rb @@ -19,6 +19,7 @@ resources :pipelines, only: [:index, :new, :create, :show, :destroy] do get :failures get :status get :test_report + get :downloadable_artifacts end resources :stages, only: [], param: :name, controller: 'pipelines/stages' do diff --git a/config/routes/project.rb b/config/routes/project.rb index 09b212bc1a2..d62e2f1b2f2 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -129,6 +129,8 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do put :revoke end end + + resource :packages_and_registries, only: [:show] end resources :autocomplete_sources, only: [] do @@ -265,6 +267,15 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do end get '/cycle_analytics', to: redirect('%{namespace_id}/%{project_id}/-/value_stream_analytics') + namespace :analytics do + resource :cycle_analytics, only: :show, path: 'value_stream_analytics' + scope module: :cycle_analytics, as: 'cycle_analytics', path: 'value_stream_analytics' do + resources :value_streams, only: [:index] do + resources :stages, only: [:index] + end + end + end + concerns :clusterable namespace :serverless do |