Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42

5 files changed, 13 insertions, 4 deletions

diff --git a/config/routes/admin.rb b/config/routes/admin.rb
index 6b786fc82b3..d066dd2fb35 100644
--- a/config/routes/admin.rb
+++ b/config/routes/admin.rb
@@ -105,7 +105,8 @@ namespace :admin do
   resources :projects, only: [:index]
 
   resources :usage_trends, only: :index
-  resource :dev_ops_report, controller: 'dev_ops_report', only: :show
+  resource :dev_ops_reports, controller: 'dev_ops_report', only: :show
+  get 'dev_ops_report', to: redirect('admin/dev_ops_reports')
   resources :cohorts, only: :index
 
   scope(path: 'projects/*namespace_id',
diff --git a/config/routes/group.rb b/config/routes/group.rb
index fecd3135cba..bf6094ff2f1 100644
--- a/config/routes/group.rb
+++ b/config/routes/group.rb
@@ -99,7 +99,7 @@ constraints(::Constraints::GroupUrlConstrainer.new) do
       delete :leave, on: :collection
     end
 
-    resources :group_links, only: [:create, :update, :destroy], constraints: { id: /\d+|:id/ }
+    resources :group_links, only: [:update, :destroy], constraints: { id: /\d+|:id/ }
 
     resources :uploads, only: [:create] do
       collection do
@@ -135,7 +135,7 @@ constraints(::Constraints::GroupUrlConstrainer.new) do
 
     namespace :crm do
       resources :contacts, only: [:index, :new, :edit]
-      resources :organizations, only: [:index, :new]
+      resources :organizations, only: [:index, :new, :edit]
     end
   end
 
diff --git a/config/routes/import.rb b/config/routes/import.rb
index 9c76c4435ff..228c5776197 100644
--- a/config/routes/import.rb
+++ b/config/routes/import.rb
@@ -10,6 +10,8 @@ Devise.omniauth_providers.map(&:downcase).each do |provider|
 end
 
 namespace :import do
+  resources :history, only: [:index], controller: :history
+
   resources :available_namespaces, only: [:index], controller: :available_namespaces
 
   namespace :url do
diff --git a/config/routes/project.rb b/config/routes/project.rb
index 1783f3acc68..a3f6139a6ef 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -247,7 +247,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
 
         resources :starrers, only: [:index]
         resources :forks, only: [:index, :new, :create]
-        resources :group_links, only: [:create, :update, :destroy], constraints: { id: /\d+|:id/ }
+        resources :group_links, only: [:update, :destroy], constraints: { id: /\d+|:id/ }
 
         resource :import, only: [:new, :create, :show]
         resource :avatar, only: [:show, :destroy]
diff --git a/config/routes/uploads.rb b/config/routes/uploads.rb
index e2cdf8ba606..a72730c1214 100644
--- a/config/routes/uploads.rb
+++ b/config/routes/uploads.rb
@@ -38,6 +38,12 @@ scope path: :uploads do
   post ':model/authorize',
     to: 'uploads#authorize',
     constraints: { model: /personal_snippet|user/ }
+
+  # Alert Metric Images
+  get "-/system/:model/:mounted_as/:id/:filename",
+      to:           "uploads#show",
+      constraints:  { model: /alert_management_metric_image/, mounted_as: /file/, filename: %r{[^/]+} },
+      as: 'alert_metric_image_upload'
 end
 
 # Redirect old note attachments path to new uploads path.