Add latest changes from gitlab-org/gitlab@master

4 files changed, 9 insertions, 1 deletions

diff --git a/config/routes/group.rb b/config/routes/group.rb
index 3186a01d073..9571d70d103 100644
--- a/config/routes/group.rb
+++ b/config/routes/group.rb
@@ -32,6 +32,10 @@ constraints(::Constraints::GroupUrlConstrainer.new) do
       resource :ci_cd, only: [:show, :update], controller: 'ci_cd' do
         put :reset_registration_token
         patch :update_auto_devops
+        post :create_deploy_token, path: 'deploy_token/create', to: 'repository#create_deploy_token'
+      end
+
+      resource :repository, only: [:show], controller: 'repository' do
         post :create_deploy_token, path: 'deploy_token/create'
       end
 
diff --git a/config/routes/issues.rb b/config/routes/issues.rb
index 9ac69975690..51b4637b89f 100644
--- a/config/routes/issues.rb
+++ b/config/routes/issues.rb
@@ -18,5 +18,6 @@ resources :issues, concerns: :awardable, constraints: { id: /\d+/ } do
   collection do
     post :bulk_update
     post :import_csv
+    post :export_csv
   end
 end
diff --git a/config/routes/merge_requests.rb b/config/routes/merge_requests.rb
index fe58649b684..ba802822485 100644
--- a/config/routes/merge_requests.rb
+++ b/config/routes/merge_requests.rb
@@ -15,6 +15,7 @@ resources :merge_requests, concerns: :awardable, except: [:new, :create, :show],
     get :test_reports
     get :exposed_artifacts
     get :coverage_reports
+    get :terraform_reports
 
     scope constraints: ->(req) { req.format == :json }, as: :json do
       get :commits
diff --git a/config/routes/project.rb b/config/routes/project.rb
index 1ce889dd578..bcd2fbf4151 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -277,6 +277,8 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
           end
         end
 
+        resources :alert_management, only: [:index], controller: :alert_management
+
         namespace :error_tracking do
           resources :projects, only: :index
         end
@@ -503,7 +505,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
                                             :labels, :milestones, :services, :boards, :releases,
                                             :forks, :group_links, :import, :avatar, :mirror,
                                             :cycle_analytics, :mattermost, :variables, :triggers,
-                                            :environments, :protected_environments, :error_tracking,
+                                            :environments, :protected_environments, :error_tracking, :alert_management,
                                             :serverless, :clusters, :audit_events, :wikis, :merge_requests,
                                             :vulnerability_feedback, :security, :dependencies)
     end