Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaran <maran.hidskes@gmail.com>2015-05-08 16:03:26 +0300
committerMaran <maran.hidskes@gmail.com>2015-05-08 22:32:03 +0300
commita0fd2eb568cdbe3537f10a83191fde893a5d6fcd (patch)
treedee6d4dd8130083eb9a8e7c9168bb7d4efc1a427 /app/models/user.rb
parent6c32abc5f7f090d4932054e5cc1ff0594edd5ff1 (diff)
Don't show duplicate deploy keys. Fixes #1516
Diffstat (limited to 'app/models/user.rb')
-rw-r--r--app/models/user.rb2
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