diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-17 14:33:21 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-17 14:33:21 +0300 |
commit | 7021455bd1ed7b125c55eb1b33c5a01f2bc55ee0 (patch) | |
tree | 5bdc2229f5198d516781f8d24eace62fc7e589e9 /config/routes | |
parent | 185b095e93520f96e9cfc31d9c3e69b498cdab7c (diff) |
Add latest changes from gitlab-org/gitlab@15-6-stable-eev15.6.0-rc42
Diffstat (limited to 'config/routes')
-rw-r--r-- | config/routes/group.rb | 6 | ||||
-rw-r--r-- | config/routes/project.rb | 18 |
2 files changed, 13 insertions, 11 deletions
diff --git a/config/routes/group.rb b/config/routes/group.rb index 4a47b349665..a715596580d 100644 --- a/config/routes/group.rb +++ b/config/routes/group.rb @@ -121,7 +121,11 @@ constraints(::Constraints::GroupUrlConstrainer.new) do resource :dependency_proxy, only: [:show, :update] resources :email_campaigns, only: :index - resources :observability, only: :index + namespace :observability do + get 'dashboards' + get 'explore' + get 'manage' + end namespace :harbor do resources :repositories, only: [:index, :show], constraints: { id: %r{[a-zA-Z./:0-9_\-]+} } do diff --git a/config/routes/project.rb b/config/routes/project.rb index 0b0d370223c..5a85a029607 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -142,7 +142,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do end end - resource :repository, only: [:show], controller: :repository do + resource :repository, only: [:show, :update], controller: :repository do # TODO: Removed this "create_deploy_token" route after change was made in app/helpers/ci_variables_helper.rb:14 # See MR comment for more detail: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/27059#note_311585356 post :create_deploy_token, path: 'deploy_token/create' @@ -353,7 +353,9 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do end resources :alert_management, only: [:index] do - get 'details', on: :member + member do + get 'details(/*page)', to: 'alert_management#details', as: 'details' + end end get 'alert_management/:id', to: 'alert_management#details', as: 'alert_management_alert' @@ -379,14 +381,6 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do resources :projects, only: :index end - resources :product_analytics, only: [:index] do - collection do - get :setup - get :test - get :graphs - end - end - resources :error_tracking, only: [:index], controller: :error_tracking do collection do get ':issue_id/details', @@ -478,6 +472,10 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do end end end + + namespace :ml do + resources :experiments, only: [:index, :show], controller: 'experiments' + end end # End of the /-/ scope. |