Add latest changes from gitlab-org/gitlab@master

2 files changed, 3 insertions, 3 deletions

diff --git a/lib/gitlab/audit/runner_registration_token_author.rb b/lib/gitlab/audit/ci_runner_token_author.rb
index 53785236f72..cc140a29260 100644
--- a/lib/gitlab/audit/runner_registration_token_author.rb
+++ b/lib/gitlab/audit/ci_runner_token_author.rb
@@ -2,7 +2,7 @@
 
 module Gitlab
   module Audit
-    class RunnerRegistrationTokenAuthor < Gitlab::Audit::NullAuthor
+    class CiRunnerTokenAuthor < Gitlab::Audit::NullAuthor
       def initialize(token:, entity_type:, entity_path:)
         super(id: -1, name: "Registration token: #{token}")
 
diff --git a/lib/gitlab/audit/null_author.rb b/lib/gitlab/audit/null_author.rb
index 254d3f1c7ac..64aec51471a 100644
--- a/lib/gitlab/audit/null_author.rb
+++ b/lib/gitlab/audit/null_author.rb
@@ -14,12 +14,12 @@ module Gitlab
       # @param [Integer] id
       # @param [String] name
       #
-      # @return [Gitlab::Audit::UnauthenticatedAuthor, Gitlab::Audit::DeletedAuthor, Gitlab::Audit::RunnerRegistrationTokenAuthor]
+      # @return [Gitlab::Audit::UnauthenticatedAuthor, Gitlab::Audit::DeletedAuthor, Gitlab::Audit::CiRunnerTokenAuthor]
       def self.for(id, audit_event)
         name = audit_event[:author_name] || audit_event.details[:author_name]
 
         if audit_event.details.include?(:runner_registration_token)
-          ::Gitlab::Audit::RunnerRegistrationTokenAuthor.new(
+          ::Gitlab::Audit::CiRunnerTokenAuthor.new(
             token: audit_event.details[:runner_registration_token],
             entity_type: audit_event.entity_type || audit_event.details[:entity_type],
             entity_path: audit_event.entity_path || audit_event.details[:entity_path]