diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-26 08:27:41 +0000 |
|---|---|---|
| committer | Simon Knox <psimyn@gmail.com> | 2017-07-27 11:35:27 +1000 |
| commit | 28a5b41ef194802bb93bff3ad6b1b36f37a96b8f (patch) | |
| tree | 26105170aef2c6472c941e2b1cff206c4007fef4 | |
| parent | 74321f08fc5a686f6fffba2c179226d3a53e9952 (diff) | |
| download | gitlab-ce-28a5b41ef194802bb93bff3ad6b1b36f37a96b8f.tar.gz | |
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
| -rw-r--r-- | app/serializers/deploy_key_entity.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/35338-deploy-keys-should-not-show-pending-delete-projects.yml | 4 | ||||
| -rw-r--r-- | spec/serializers/deploy_key_entity_spec.rb | 4 |
3 files changed, 8 insertions, 2 deletions
diff --git a/app/serializers/deploy_key_entity.rb b/app/serializers/deploy_key_entity.rb index 068013c8829..c75431a79ae 100644 --- a/app/serializers/deploy_key_entity.rb +++ b/app/serializers/deploy_key_entity.rb @@ -9,7 +9,7 @@ class DeployKeyEntity < Grape::Entity expose :created_at expose :updated_at 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 expose :can_edit diff --git a/changelogs/unreleased/35338-deploy-keys-should-not-show-pending-delete-projects.yml b/changelogs/unreleased/35338-deploy-keys-should-not-show-pending-delete-projects.yml new file mode 100644 index 00000000000..73808030f4c --- /dev/null +++ b/changelogs/unreleased/35338-deploy-keys-should-not-show-pending-delete-projects.yml @@ -0,0 +1,4 @@ +--- +title: Pending delete projects should not show in deploy keys. +merge_request: 13088 +author: diff --git a/spec/serializers/deploy_key_entity_spec.rb b/spec/serializers/deploy_key_entity_spec.rb index 9620f9665cf..8149de869f1 100644 --- a/spec/serializers/deploy_key_entity_spec.rb +++ b/spec/serializers/deploy_key_entity_spec.rb @@ -2,13 +2,15 @@ require 'spec_helper' describe DeployKeyEntity do include RequestAwareEntity - + let(:user) { create(:user) } let(:project) { create(:empty_project, :internal)} 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_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_pending_delete) { create(:deploy_keys_project, project: project_pending_delete, deploy_key: deploy_key) } let(:entity) { described_class.new(deploy_key, user: user) } |