Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42

1 files changed, 4 insertions, 1 deletions

diff --git a/lib/api/deploy_keys.rb b/lib/api/deploy_keys.rb
index 9f0f569b711..0ab9fe6644c 100644
--- a/lib/api/deploy_keys.rb
+++ b/lib/api/deploy_keys.rb
@@ -23,11 +23,14 @@ module API
     desc 'Return all deploy keys'
     params do
       use :pagination
+      optional :public, type: Boolean, default: false, desc: "Only return deploy keys that are public"
     end
     get "deploy_keys" do
       authenticated_as_admin!
 
-      present paginate(DeployKey.all), with: Entities::DeployKey
+      deploy_keys = params[:public] ? DeployKey.are_public : DeployKey.all
+
+      present paginate(deploy_keys.including_projects_with_write_access), with: Entities::DeployKey, include_projects_with_write_access: true
     end
 
     params do