Add latest changes from gitlab-org/gitlab@master

6 files changed, 64 insertions, 44 deletions

diff --git a/app/serializers/deploy_key_entity.rb b/app/serializers/deploy_key_entity.rb
deleted file mode 100644
index 486189b84ca..00000000000
--- a/app/serializers/deploy_key_entity.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-class DeployKeyEntity < Grape::Entity
-  expose :id
-  expose :user_id
-  expose :title
-  expose :fingerprint
-  expose :fingerprint_sha256
-  expose :destroyed_when_orphaned?, as: :destroyed_when_orphaned
-  expose :almost_orphaned?, as: :almost_orphaned
-  expose :created_at
-  expose :updated_at
-  expose :deploy_keys_projects, using: DeployKeysProjectEntity do |deploy_key|
-    deploy_key.deploy_keys_projects.select do |deploy_key_project|
-      !deploy_key_project.project&.pending_delete? && (allowed_to_read_project?(deploy_key_project.project) || options[:user].admin?)
-    end
-  end
-  expose :can_edit
-  expose :user, as: :owner, using: ::API::Entities::UserBasic, if: -> (_, opts) { can_read_owner?(opts) }
-
-  private
-
-  def can_edit
-    Ability.allowed?(options[:user], :update_deploy_key, object) ||
-      Ability.allowed?(options[:user], :update_deploy_keys_project, object.deploy_keys_project_for(options[:project]))
-  end
-
-  def can_read_owner?(opts)
-    opts[:with_owner] && Ability.allowed?(options[:user], :read_user, object.user)
-  end
-
-  def allowed_to_read_project?(project)
-    if options[:readable_project_ids]
-      options[:readable_project_ids].include?(project.id)
-    else
-      Ability.allowed?(options[:user], :read_project, project)
-    end
-  end
-end
diff --git a/app/serializers/deploy_key_serializer.rb b/app/serializers/deploy_key_serializer.rb
deleted file mode 100644
index a1cd98b631b..00000000000
--- a/app/serializers/deploy_key_serializer.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-class DeployKeySerializer < BaseSerializer
-  entity DeployKeyEntity
-end
diff --git a/app/serializers/deploy_keys/basic_deploy_key_entity.rb b/app/serializers/deploy_keys/basic_deploy_key_entity.rb
new file mode 100644
index 00000000000..9184bc5f0ce
--- /dev/null
+++ b/app/serializers/deploy_keys/basic_deploy_key_entity.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module DeployKeys
+  class BasicDeployKeyEntity < Grape::Entity
+    expose :id
+    expose :user_id
+    expose :title
+    expose :fingerprint
+    expose :fingerprint_sha256
+    expose :destroyed_when_orphaned?, as: :destroyed_when_orphaned
+    expose :almost_orphaned?, as: :almost_orphaned
+    expose :created_at
+    expose :updated_at
+    expose :can_edit
+    expose :user, as: :owner, using: ::API::Entities::UserBasic, if: -> (_, opts) { can_read_owner?(opts) }
+
+    private
+
+    def can_edit
+      Ability.allowed?(options[:user], :update_deploy_key, object) ||
+        Ability.allowed?(options[:user], :update_deploy_keys_project, object.deploy_keys_project_for(options[:project]))
+    end
+
+    def can_read_owner?(opts)
+      opts[:with_owner] && Ability.allowed?(options[:user], :read_user, object.user)
+    end
+  end
+end
diff --git a/app/serializers/deploy_keys/basic_deploy_key_serializer.rb b/app/serializers/deploy_keys/basic_deploy_key_serializer.rb
new file mode 100644
index 00000000000..699f3baac78
--- /dev/null
+++ b/app/serializers/deploy_keys/basic_deploy_key_serializer.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module DeployKeys
+  class BasicDeployKeySerializer < BaseSerializer
+    entity BasicDeployKeyEntity
+  end
+end
diff --git a/app/serializers/deploy_keys/deploy_key_entity.rb b/app/serializers/deploy_keys/deploy_key_entity.rb
new file mode 100644
index 00000000000..79f386d1529
--- /dev/null
+++ b/app/serializers/deploy_keys/deploy_key_entity.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module DeployKeys
+  class DeployKeyEntity < BasicDeployKeyEntity
+    expose :deploy_keys_projects, using: DeployKeysProjectEntity do |deploy_key|
+      deploy_key.deploy_keys_projects.select do |deploy_key_project|
+        !deploy_key_project.project&.pending_delete? &&
+        (allowed_to_read_project?(deploy_key_project.project) || options[:user].can_admin_all_resources?)
+      end
+    end
+
+    private
+
+    def allowed_to_read_project?(project)
+      if options[:readable_project_ids]
+        options[:readable_project_ids].include?(project.id)
+      else
+        Ability.allowed?(options[:user], :read_project, project)
+      end
+    end
+  end
+end
diff --git a/app/serializers/deploy_keys/deploy_key_serializer.rb b/app/serializers/deploy_keys/deploy_key_serializer.rb
new file mode 100644
index 00000000000..b00ef65696f
--- /dev/null
+++ b/app/serializers/deploy_keys/deploy_key_serializer.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module DeployKeys
+  class DeployKeySerializer < BaseSerializer
+    entity DeployKeyEntity
+  end
+end