diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-26 08:27:41 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-26 08:27:41 +0000 |
| commit | 121b90aa69946a3ecdb9f1d60eb7d0debeb414f0 (patch) | |
| tree | 9b44beb908a51a2b23bd01bfa55835010fc4a7a3 /app/serializers | |
| parent | fd0823d6e49b0d0a4819f54f54fa034479c6884b (diff) | |
| parent | 250dbecd28473ce256e46f7233c14acb8c02a29d (diff) | |
| download | gitlab-ce-121b90aa69946a3ecdb9f1d60eb7d0debeb414f0.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
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/deploy_key_entity.rb | 2 |
1 files changed, 1 insertions, 1 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 |