Add latest changes from gitlab-org/gitlab@master

2 files changed, 19 insertions, 2 deletions

diff --git a/app/presenters/release_presenter.rb b/app/presenters/release_presenter.rb
index 8cf7446ce64..3db89df1cc8 100644
--- a/app/presenters/release_presenter.rb
+++ b/app/presenters/release_presenter.rb
@@ -44,9 +44,10 @@ class ReleasePresenter < Gitlab::View::Presenter::Delegated
   end
 
   def evidence_file_path
-    return unless release.evidence.present?
+    evidence = release.evidences.first
+    return unless evidence
 
-    evidence_project_release_url(project, release.to_param, format: :json)
+    project_evidence_url(project, release, evidence, format: :json)
   end
 
   private
diff --git a/app/presenters/releases/evidence_presenter.rb b/app/presenters/releases/evidence_presenter.rb
new file mode 100644
index 00000000000..a00cbacb7d8
--- /dev/null
+++ b/app/presenters/releases/evidence_presenter.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Releases
+  class EvidencePresenter < Gitlab::View::Presenter::Delegated
+    include ActionView::Helpers::UrlHelper
+
+    presents :evidence
+
+    def filepath
+      release = evidence.release
+      project = release.project
+
+      project_evidence_url(project, release, evidence, format: :json)
+    end
+  end
+end