Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42

4 files changed, 22 insertions, 21 deletions

diff --git a/config/routes/jira_connect.rb b/config/routes/jira_connect.rb
index 344f0114364..202d2574ad0 100644
--- a/config/routes/jira_connect.rb
+++ b/config/routes/jira_connect.rb
@@ -22,4 +22,5 @@ namespace :jira_connect do
   end
 
   resources :oauth_callbacks, only: [:index]
+  resource :oauth_application_id, only: [:show]
 end
diff --git a/config/routes/members.rb b/config/routes/members.rb
deleted file mode 100644
index e84f0987171..00000000000
--- a/config/routes/members.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-namespace :members do
-  namespace :mailgun do
-    resources :permanent_failures, only: [:create]
-  end
-end
diff --git a/config/routes/project.rb b/config/routes/project.rb
index 6b2a9700686..afc06780471 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -130,13 +130,25 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
             end
           end
 
-          resource :integrations, only: [:show]
+          resources :integrations, constraints: { id: %r{[^/]+} }, only: [:index, :edit, :update] do
+            member do
+              put :test
+            end
+
+            resources :hook_logs, only: [:show], controller: :integration_hook_logs do
+              member do
+                post :retry
+              end
+            end
+          end
 
           resource :repository, only: [:show], 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'
             post :cleanup
+
+            resources :branch_rules, only: [:index]
           end
 
           resources :access_tokens, only: [:index, :create] do
@@ -209,12 +221,14 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
           end
         end
 
-        resources :integrations, controller: :services, constraints: { id: %r{[^/]+} }, only: [:edit, :update] do
+        # Legacy routes for `/-/integrations` which are now in `/-/settings/integrations`.
+        # Can be removed in 15.2, see https://gitlab.com/gitlab-org/gitlab/-/issues/334846
+        resources :integrations, controller: 'settings/integrations', constraints: { id: %r{[^/]+} }, only: [:edit, :update] do
           member do
             put :test
           end
 
-          resources :hook_logs, only: [:show], controller: :service_hook_logs do
+          resources :hook_logs, only: [:show], controller: 'settings/integration_hook_logs' do
             member do
               post :retry
             end
@@ -227,7 +241,9 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
           end
         end
 
-        resources :releases, only: [:index, :new, :show, :edit], param: :tag, constraints: { tag: %r{[^/]+} } do
+        get 'releases/permalink/latest(/)(*suffix_path)', to: 'releases#latest_permalink', as: :latest_release_permalink, format: false
+
+        resources :releases, only: [:index, :new, :show, :edit], param: :tag, constraints: { tag: %r{[^\\]+} } do
           member do
             get :downloads, path: 'downloads/*filepath', format: false
             scope module: :releases do
@@ -236,8 +252,6 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
           end
         end
 
-        get 'releases/permalink/latest(/)(*suffix_path)', to: 'releases#latest_permalink', as: :latest_release_permalink, format: false
-
         resources :logs, only: [:index] do
           collection do
             get :k8s
@@ -508,7 +522,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
       end
 
       namespace :prometheus do
-        resources :alerts, constraints: { id: /\d+/ }, only: [:index, :show] do # rubocop: disable Cop/PutProjectRoutesUnderScope
+        resources :alerts, constraints: { id: /\d+/ }, only: [] do # rubocop: disable Cop/PutProjectRoutesUnderScope
           post :notify, on: :collection # rubocop:todo Cop/PutProjectRoutesUnderScope
           member do
             get :metrics_dashboard # rubocop:todo Cop/PutProjectRoutesUnderScope
diff --git a/config/routes/repository.rb b/config/routes/repository.rb
index d2be18c62f9..74e72927699 100644
--- a/config/routes/repository.rb
+++ b/config/routes/repository.rb
@@ -57,13 +57,6 @@ scope format: false do
 
     resources :protected_branches, only: [:index, :show, :create, :update, :destroy, :patch], constraints: { id: Gitlab::PathRegex.git_reference_regex }
     resources :protected_tags, only: [:index, :show, :create, :update, :destroy]
-
-    scope constraints: { id: /[^\0]+?/ } do
-      scope controller: :static_site_editor do
-        get '/sse/:id(/*vueroute)', action: :show, as: :show_sse
-        get '/sse', as: :root_sse, action: :index
-      end
-    end
   end
 
   scope constraints: { id: /[^\0]+/ } do