Add latest changes from gitlab-org/gitlab@master

1 files changed, 8 insertions, 0 deletions

diff --git a/app/controllers/projects/artifacts_controller.rb b/app/controllers/projects/artifacts_controller.rb
index 85bdeb07b00..c675e4bb61c 100644
--- a/app/controllers/projects/artifacts_controller.rb
+++ b/app/controllers/projects/artifacts_controller.rb
@@ -39,6 +39,8 @@ class Projects::ArtifactsController < Projects::ApplicationController
     return render_404 unless artifact_file
 
     log_artifacts_filesize(artifact_file.model)
+    audit_download(build, artifact_file.filename)
+
     send_upload(artifact_file, attachment: artifact_file.filename, proxy: params[:proxy])
   end
 
@@ -106,6 +108,10 @@ class Projects::ArtifactsController < Projects::ApplicationController
 
   private
 
+  def audit_download(build, filename)
+    # overridden in EE
+  end
+
   def extract_ref_name_and_path
     return unless params[:ref_name_and_path]
 
@@ -184,3 +190,5 @@ class Projects::ArtifactsController < Projects::ApplicationController
     return access_denied! unless can?(current_user, :read_job_artifacts, job_artifact)
   end
 end
+
+Projects::ArtifactsController.prepend_mod