Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42

2 files changed, 21 insertions, 2 deletions

diff --git a/lib/gitlab/audit/deploy_token_author.rb b/lib/gitlab/audit/deploy_token_author.rb
new file mode 100644
index 00000000000..69b42034826
--- /dev/null
+++ b/lib/gitlab/audit/deploy_token_author.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Audit
+    class DeployTokenAuthor < Gitlab::Audit::NullAuthor
+      def initialize(name: nil)
+        super(id: -2, name: name)
+      end
+
+      # Events that are authored by a deploy token, should be
+      # shown as authored by `Deploy Token` in the UI.
+      def name
+        @name || _('Deploy Token')
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/audit/null_author.rb b/lib/gitlab/audit/null_author.rb
index 80e0c4ddf58..08be6ae6d9f 100644
--- a/lib/gitlab/audit/null_author.rb
+++ b/lib/gitlab/audit/null_author.rb
@@ -13,8 +13,8 @@ module Gitlab
       #
       # @param [Integer] id
       # @param [String] name
-      #
-      # @return [Gitlab::Audit::UnauthenticatedAuthor, Gitlab::Audit::DeletedAuthor, Gitlab::Audit::CiRunnerTokenAuthor]
+      # rubocop: disable Layout/LineLength
+      # @return [Gitlab::Audit::UnauthenticatedAuthor, Gitlab::Audit::DeletedAuthor, Gitlab::Audit::CiRunnerTokenAuthor, Gitlab::Audit::DeployTokenAuthor]
       def self.for(id, audit_event)
         name = audit_event[:author_name] || audit_event.details[:author_name]
 
@@ -22,6 +22,8 @@ module Gitlab
           Gitlab::Audit::CiRunnerTokenAuthor.new(audit_event)
         elsif id == -1
           Gitlab::Audit::UnauthenticatedAuthor.new(name: name)
+        elsif id == -2
+          Gitlab::Audit::DeployTokenAuthor.new(name: name)
         else
           Gitlab::Audit::DeletedAuthor.new(id: id, name: name)
         end