diff options
| author | Thong Kuah <tkuah@gitlab.com> | 2019-08-06 13:39:35 +0000 |
|---|---|---|
| committer | Thong Kuah <tkuah@gitlab.com> | 2019-08-06 13:39:35 +0000 |
| commit | 4c1a5ba822109582d85a19ac4ce7e99e5cfa9641 (patch) | |
| tree | db3cb210ca38109fe84411bccc9ff29211e58610 /app/serializers | |
| parent | 26087322713e2949f2bf207798512374757a484c (diff) | |
| parent | 743497aa0502781072b84eb51c2663180813b5c6 (diff) | |
| download | gitlab-ce-4c1a5ba822109582d85a19ac4ce7e99e5cfa9641.tar.gz | |
Merge branch '43080-speed-up-deploy-keys' into 'master'
Improve the performance of viewing deploy keys
Closes #43080
See merge request gitlab-org/gitlab-ce!31384
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/deploy_key_entity.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/serializers/deploy_key_entity.rb b/app/serializers/deploy_key_entity.rb index 54bf030aba1..e47d6454780 100644 --- a/app/serializers/deploy_key_entity.rb +++ b/app/serializers/deploy_key_entity.rb @@ -10,9 +10,10 @@ class DeployKeyEntity < Grape::Entity expose :created_at expose :updated_at expose :deploy_keys_projects, using: DeployKeysProjectEntity do |deploy_key| - deploy_key.deploy_keys_projects - .without_project_deleted - .select { |deploy_key_project| Ability.allowed?(options[:user], :read_project, deploy_key_project.project) } + deploy_key.deploy_keys_projects.select do |deploy_key_project| + !deploy_key_project.project&.pending_delete? && + Ability.allowed?(options[:user], :read_project, deploy_key_project.project) + end end expose :can_edit |