Add latest changes from gitlab-org/gitlab@15-6-stable-eev15.6.0-rc42

1 files changed, 11 insertions, 1 deletions

diff --git a/app/controllers/concerns/send_file_upload.rb b/app/controllers/concerns/send_file_upload.rb
index c8369c465b8..c91edb74d6b 100644
--- a/app/controllers/concerns/send_file_upload.rb
+++ b/app/controllers/concerns/send_file_upload.rb
@@ -30,7 +30,17 @@ module SendFileUpload
       headers.store(*Gitlab::Workhorse.send_url(file_upload.url(**redirect_params)))
       head :ok
     else
-      redirect_to file_upload.url(**redirect_params)
+      redirect_to cdn_fronted_url(file_upload, redirect_params)
+    end
+  end
+
+  def cdn_fronted_url(file, redirect_params)
+    if file.respond_to?(:cdn_enabled_url)
+      result = file.cdn_enabled_url(request.remote_ip, redirect_params[:query])
+      Gitlab::ApplicationContext.push(artifact_used_cdn: result.used_cdn)
+      result.url
+    else
+      file.url(**redirect_params)
     end
   end