diff options
| author | Marin Jankovski <marin@gitlab.com> | 2015-05-10 07:21:39 +0000 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2015-05-10 07:21:39 +0000 |
| commit | 6fdc51f81d013a1e01c0742e81cdd0fa5476e2d6 (patch) | |
| tree | 4af10fd6527ee3de8a115541fef9f69f5e713efd /app/models/user.rb | |
| parent | 40c8295a24aace3210a8bc485f853d556a8bdc5c (diff) | |
| parent | a0fd2eb568cdbe3537f10a83191fde893a5d6fcd (diff) | |
| download | gitlab-ce-6fdc51f81d013a1e01c0742e81cdd0fa5476e2d6.tar.gz | |
Merge branch 'bug/fix-duplicate-deploy-keys' into 'master'
Don't show duplicate deploy keys
This fixes the issue described in [#1516](https://gitlab.com/gitlab-org/gitlab-ce/issues/1516) where you would see the same deploy key multiple times if it was used by multiple projects.
See merge request !629
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 1cf7cfea974..a70cbaa518b 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -438,7 +438,7 @@ class User < ActiveRecord::Base end def project_deploy_keys - DeployKey.in_projects(self.authorized_projects.pluck(:id)) + DeployKey.unscoped.in_projects(self.authorized_projects.pluck(:id)).distinct(:id) end def accessible_deploy_keys |