Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42

4 files changed, 15 insertions, 6 deletions

diff --git a/config/routes/import.rb b/config/routes/import.rb
index 228c5776197..004839d22a7 100644
--- a/config/routes/import.rb
+++ b/config/routes/import.rb
@@ -23,6 +23,7 @@ namespace :import do
     get :status
     get :callback
     get :realtime_changes
+    post :cancel
   end
 
   resource :gitea, only: [:create, :new], controller: :gitea do
@@ -68,6 +69,10 @@ namespace :import do
     post :authorize
   end
 
+  resource :github_group, only: [] do
+    get :status
+  end
+
   resource :bulk_imports, only: [:create] do
     post :configure
     get :status
diff --git a/config/routes/jira_connect.rb b/config/routes/jira_connect.rb
index 202d2574ad0..f45f524935a 100644
--- a/config/routes/jira_connect.rb
+++ b/config/routes/jira_connect.rb
@@ -14,6 +14,7 @@ namespace :jira_connect do
 
   resources :subscriptions, only: [:index, :create, :destroy]
   resources :branches, only: [:new]
+  resources :public_keys, only: :show
 
   resources :installations, only: [:index] do
     collection do
diff --git a/config/routes/project.rb b/config/routes/project.rb
index 79ca13e3d8c..cd9315ba2aa 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -223,11 +223,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
           end
         end
 
-        resources :boards, only: [:index, :show, :create, :update, :destroy], constraints: { id: /\d+/ } do
-          collection do
-            get :recent
-          end
-        end
+        resources :boards, only: [:index, :show], constraints: { id: /\d+/ }
 
         get 'releases/permalink/latest(/)(*suffix_path)', to: 'releases#latest_permalink', as: :latest_release_permalink, format: false
 
@@ -368,6 +364,14 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
 
         resources :incidents, only: [:index]
 
+        namespace :incident_management do
+          resources :timeline_events, only: [] do
+            collection do
+              post :preview_markdown
+            end
+          end
+        end
+
         get 'issues/incident/:id' => 'incidents#show', as: :issues_incident
 
         namespace :error_tracking do
diff --git a/config/routes/user.rb b/config/routes/user.rb
index a9e0d7df88f..0c1bc1956a9 100644
--- a/config/routes/user.rb
+++ b/config/routes/user.rb
@@ -64,7 +64,6 @@ scope '-/users', module: :users do
   end
 
   resources :callouts, only: [:create]
-  resources :namespace_callouts, only: [:create]
   resources :group_callouts, only: [:create]
   resources :project_callouts, only: [:create]
 end