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

1 files changed, 6 insertions, 0 deletions

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.