Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42

3 files changed, 18 insertions, 2 deletions

diff --git a/config/routes/explore.rb b/config/routes/explore.rb
index c6bf98b6fb3..6ddf4d23138 100644
--- a/config/routes/explore.rb
+++ b/config/routes/explore.rb
@@ -5,6 +5,8 @@ namespace :explore do
     collection do
       get :trending
       get :starred
+      get :topics
+      get 'topics/:topic_name', action: :topic, as: :topic, constraints: { topic_name: /.+/ }
     end
   end
 
diff --git a/config/routes/group.rb b/config/routes/group.rb
index 803249f8861..9a50d580747 100644
--- a/config/routes/group.rb
+++ b/config/routes/group.rb
@@ -125,6 +125,13 @@ constraints(::Constraints::GroupUrlConstrainer.new) do
         get 'milestones'
       end
     end
+
+    resources :crm, only: [] do
+      collection do
+        get 'contacts'
+        get 'organizations'
+      end
+    end
   end
 
   scope(path: '*id',
@@ -148,5 +155,7 @@ scope format: false do
     get 'v2/*group_id/dependency_proxy/containers/*image/blobs/:sha' => 'groups/dependency_proxy_for_containers#blob' # rubocop:todo Cop/PutGroupRoutesUnderScope
     post 'v2/*group_id/dependency_proxy/containers/*image/blobs/:sha/upload/authorize' => 'groups/dependency_proxy_for_containers#authorize_upload_blob' # rubocop:todo Cop/PutGroupRoutesUnderScope
     post 'v2/*group_id/dependency_proxy/containers/*image/blobs/:sha/upload' => 'groups/dependency_proxy_for_containers#upload_blob' # rubocop:todo Cop/PutGroupRoutesUnderScope
+    post 'v2/*group_id/dependency_proxy/containers/*image/manifests/*tag/upload/authorize' => 'groups/dependency_proxy_for_containers#authorize_upload_manifest' # rubocop:todo Cop/PutGroupRoutesUnderScope
+    post 'v2/*group_id/dependency_proxy/containers/*image/manifests/*tag/upload' => 'groups/dependency_proxy_for_containers#upload_manifest' # rubocop:todo Cop/PutGroupRoutesUnderScope
   end
 end
diff --git a/config/routes/project.rb b/config/routes/project.rb
index b1be9ad2ada..7f9b2cc4fbf 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -38,7 +38,9 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
         end
 
         namespace :security do
-          resource :configuration, only: [:show], controller: :configuration
+          resource :configuration, only: [:show], controller: :configuration do
+            resource :sast, only: [:show], controller: :sast_configuration
+          end
         end
 
         resources :artifacts, only: [:index, :destroy]
@@ -358,7 +360,9 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
           get 'details', on: :member
         end
 
-        resources :work_items, only: [:index]
+        get 'alert_management/:id', to: 'alert_management#details', as: 'alert_management_alert'
+
+        get 'work_items/*work_items_path' => 'work_items#index', as: :work_items
 
         resource :tracing, only: [:show]
 
@@ -536,6 +540,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
           delete :delete_attachment # rubocop:todo Cop/PutProjectRoutesUnderScope
           post :resolve # rubocop:todo Cop/PutProjectRoutesUnderScope
           delete :resolve, action: :unresolve # rubocop:todo Cop/PutProjectRoutesUnderScope
+          get :outdated_line_change # rubocop:todo Cop/PutProjectRoutesUnderScope
         end
       end