diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-20 02:18:09 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-20 02:18:09 +0300 |
commit | 6ed4ec3e0b1340f96b7c043ef51d1b33bbe85fde (patch) | |
tree | dc4d20fe6064752c0bd323187252c77e0a89144b /config/routes/project.rb | |
parent | 9868dae7fc0655bd7ce4a6887d4e6d487690eeed (diff) |
Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42
Diffstat (limited to 'config/routes/project.rb')
-rw-r--r-- | config/routes/project.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/config/routes/project.rb b/config/routes/project.rb index 53d9be13611..79ca13e3d8c 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -159,6 +159,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do resource :packages_and_registries, only: [:show] do get '/cleanup_image_tags', to: 'packages_and_registries#cleanup_tags' end + resource :merge_requests, only: [:show, :update] end resources :usage_quotas, only: [:index] @@ -312,7 +313,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do get '/deployments/cloud_run', to: 'deployments#cloud_run' get '/deployments/cloud_storage', to: 'deployments#cloud_storage' - get '/databases', to: 'databases#index' + resources :databases, only: [:index, :create, :new], path_names: { new: 'new/:product' } end resources :environments, except: [:destroy] do @@ -466,7 +467,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do end namespace :harbor do - resources :repositories, only: [:index, :show] do + resources :repositories, only: [:index, :show], constraints: { id: %r{[a-zA-Z./:0-9_\-]+} } do resources :artifacts, only: [:index] do resources :tags, only: [:index] end |