summaryrefslogtreecommitdiff
path: root/app/models/user.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-12-06 18:20:17 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-12-10 12:11:27 +0200
commit475fedc0a7c6bb9af9b15bea208ada33c94524f0 (patch)
tree7f46a02e38291e02ad55dc9be7fbdedc6e3fb6ce /app/models/user.rb
parenta885c68781ae0ca997d68fdea9f470ea4de1d1cd (diff)
downloadgitlab-ce-475fedc0a7c6bb9af9b15bea208ada33c94524f0.tar.gz
Make User#accessible_deploy_keys works in rails4
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
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 2a35b23f821..76aef38b38a 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -373,7 +373,7 @@ class User < ActiveRecord::Base
end
def accessible_deploy_keys
- DeployKey.in_projects(self.authorized_projects).uniq
+ DeployKey.in_projects(self.authorized_projects.pluck(:id)).uniq
end
def created_by