Add latest changes from gitlab-org/gitlab@14-7-stable-eev14.7.0-rc42

2 files changed, 21 insertions, 1 deletions

diff --git a/lib/gitlab/data_builder/archive_trace.rb b/lib/gitlab/data_builder/archive_trace.rb
new file mode 100644
index 00000000000..f6dd6130104
--- /dev/null
+++ b/lib/gitlab/data_builder/archive_trace.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module DataBuilder
+    module ArchiveTrace
+      extend self
+
+      def build(job)
+        {
+          object_kind: 'archive_trace',
+          trace_url: job.job_artifacts_trace.file.url,
+          build_id: job.id,
+          pipeline_id: job.pipeline_id,
+          project: job.project.hook_attrs
+        }
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/data_builder/deployment.rb b/lib/gitlab/data_builder/deployment.rb
index 267c2d32ca9..a4508bc93c5 100644
--- a/lib/gitlab/data_builder/deployment.rb
+++ b/lib/gitlab/data_builder/deployment.rb
@@ -25,7 +25,8 @@ module Gitlab
           user: deployment.deployed_by.hook_attrs,
           user_url: Gitlab::UrlBuilder.build(deployment.deployed_by),
           commit_url: Gitlab::UrlBuilder.build(deployment.commit),
-          commit_title: deployment.commit.title
+          commit_title: deployment.commit.title,
+          ref: deployment.ref
         }
       end
     end