Commit 121b90aa authored by Sean McGivern's avatar Sean McGivern

Merge branch '35338-deploy-keys-should-not-show-pending-delete-projects' into 'master'

Pending delete projects should now show in deploy keys

Closes #35338

See merge request !13088
parents fd0823d6 250dbecd
...@@ -9,7 +9,7 @@ class DeployKeyEntity < Grape::Entity ...@@ -9,7 +9,7 @@ class DeployKeyEntity < Grape::Entity
expose :created_at expose :created_at
expose :updated_at expose :updated_at
expose :projects, using: ProjectEntity do |deploy_key| expose :projects, using: ProjectEntity do |deploy_key|
deploy_key.projects.select { |project| options[:user].can?(:read_project, project) } deploy_key.projects.without_deleted.select { |project| options[:user].can?(:read_project, project) }
end end
expose :can_edit expose :can_edit
......
---
title: Pending delete projects should not show in deploy keys.
merge_request: 13088
author:
...@@ -6,9 +6,11 @@ describe DeployKeyEntity do ...@@ -6,9 +6,11 @@ describe DeployKeyEntity do
let(:user) { create(:user) } let(:user) { create(:user) }
let(:project) { create(:empty_project, :internal)} let(:project) { create(:empty_project, :internal)}
let(:project_private) { create(:empty_project, :private)} let(:project_private) { create(:empty_project, :private)}
let!(:project_pending_delete) { create(:empty_project, :internal, pending_delete: true) }
let(:deploy_key) { create(:deploy_key) } let(:deploy_key) { create(:deploy_key) }
let!(:deploy_key_internal) { create(:deploy_keys_project, project: project, deploy_key: deploy_key) } let!(:deploy_key_internal) { create(:deploy_keys_project, project: project, deploy_key: deploy_key) }
let!(:deploy_key_private) { create(:deploy_keys_project, project: project_private, deploy_key: deploy_key) } let!(:deploy_key_private) { create(:deploy_keys_project, project: project_private, deploy_key: deploy_key) }
let!(:deploy_key_pending_delete) { create(:deploy_keys_project, project: project_pending_delete, deploy_key: deploy_key) }
let(:entity) { described_class.new(deploy_key, user: user) } let(:entity) { described_class.new(deploy_key, user: user) }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment