From b39512ed755239198a9c294b6a45e65c05900235 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 18 Aug 2022 08:17:02 +0000
Subject: Add latest changes from gitlab-org/gitlab@15-3-stable-ee

---
 lib/api/support/git_access_actor.rb | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'lib/api/support/git_access_actor.rb')

diff --git a/lib/api/support/git_access_actor.rb b/lib/api/support/git_access_actor.rb
index 71395086ac2..f450630afdd 100644
--- a/lib/api/support/git_access_actor.rb
+++ b/lib/api/support/git_access_actor.rb
@@ -32,6 +32,10 @@ module API
         key || user
       end
 
+      def deploy_key_or_user
+        key.instance_of?(DeployKey) ? key : user
+      end
+
       def username
         user&.username
       end
-- 
cgit v1.2.3