Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42

4 files changed, 7 insertions, 10 deletions

diff --git a/config/routes/group.rb b/config/routes/group.rb
index 2a5931207b0..4a47b349665 100644
--- a/config/routes/group.rb
+++ b/config/routes/group.rb
@@ -121,8 +121,10 @@ constraints(::Constraints::GroupUrlConstrainer.new) do
     resource :dependency_proxy, only: [:show, :update]
     resources :email_campaigns, only: :index
 
+    resources :observability, only: :index
+
     namespace :harbor do
-      resources :repositories, only: [:index] 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
diff --git a/config/routes/help.rb b/config/routes/help.rb
index 2a0aba8b632..54ad3d43081 100644
--- a/config/routes/help.rb
+++ b/config/routes/help.rb
@@ -3,4 +3,5 @@
 get 'help'                        => 'help#index'
 get 'help/shortcuts'              => 'help#shortcuts'
 get 'help/instance_configuration' => 'help#instance_configuration'
+get 'help/drawers/*markdown_file' => 'help#drawers'
 get 'help/*path'                  => 'help#show', as: :help_page
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
diff --git a/config/routes/uploads.rb b/config/routes/uploads.rb
index ba2e8493ef9..7b598e84975 100644
--- a/config/routes/uploads.rb
+++ b/config/routes/uploads.rb
@@ -22,13 +22,6 @@ scope path: :uploads do
       constraints: { model: /appearance/, mounted_as: /logo|header_logo|favicon/, filename: /.+/ },
       as: 'appearance_upload'
 
-  # Project markdown uploads
-  # DEPRECATED: Remove this in GitLab 13.0 because this is redundant to show_namespace_project_uploads
-  # https://gitlab.com/gitlab-org/gitlab/issues/196396
-  get ":namespace_id/:project_id/:secret/:filename",
-    to: redirect("%{namespace_id}/%{project_id}/uploads/%{secret}/%{filename}"),
-    constraints: { namespace_id: /[a-zA-Z.0-9_\-]+/, project_id: /[a-zA-Z.0-9_\-]+/, filename: %r{[^/]+} }, format: false, defaults: { format: nil }
-
   # create uploads for models, snippets (notes) available for now
   post ':model',
     to: 'uploads#create',