Add latest changes from gitlab-org/gitlab@master

1 files changed, 10 insertions, 8 deletions

diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index e31748a993e..fc1037131d8 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -570,11 +570,19 @@ module API
       end
     end
 
+    def log_artifact_size(file)
+      Gitlab::ApplicationContext.push(artifact: file.model)
+    end
+
+    def present_artifacts_file!(file, **args)
+      log_artifact_size(file) if file
+
+      present_carrierwave_file!(file, **args)
+    end
+
     def present_carrierwave_file!(file, supports_direct_download: true)
       return not_found! unless file&.exists?
 
-      log_artifact_size(file) if file.is_a?(JobArtifactUploader)
-
       if file.file_storage?
         present_disk_file!(file.path, file.filename)
       elsif supports_direct_download && file.class.direct_download_enabled?
@@ -725,7 +733,6 @@ module API
     # Deprecated. Use `send_artifacts_entry` instead.
     def legacy_send_artifacts_entry(file, entry)
       header(*Gitlab::Workhorse.send_artifacts_entry(file, entry))
-      log_artifact_size(file)
 
       body ''
     end
@@ -733,15 +740,10 @@ module API
     def send_artifacts_entry(file, entry)
       header(*Gitlab::Workhorse.send_artifacts_entry(file, entry))
       header(*Gitlab::Workhorse.detect_content_type)
-      log_artifact_size(file)
 
       body ''
     end
 
-    def log_artifact_size(file)
-      Gitlab::ApplicationContext.push(artifact: file.model)
-    end
-
     # The Grape Error Middleware only has access to `env` but not `params` nor
     # `request`. We workaround this by defining methods that returns the right
     # values.