diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-08-01 16:09:30 +0100 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-08-05 06:42:33 -0700 |
| commit | 0c0232e623ab8d6d8cf3b4e7268d1a28d2c5f40b (patch) | |
| tree | 8747ffc2f3c233d1269dc60dc5514708bc998909 | |
| parent | d4d911e9a92ae3507f27661401cd9a55bfc8e4b0 (diff) | |
| download | gitlab-ce-0c0232e623ab8d6d8cf3b4e7268d1a28d2c5f40b.tar.gz | |
Fix a bug in User#accessible_deploy_keys
| -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 b439d1c0c16..74bb66d1371 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -942,7 +942,7 @@ class User < ApplicationRecord def accessible_deploy_keys @accessible_deploy_keys ||= begin - key_ids = project_deploy_keys.pluck(:id) + key_ids = project_deploy_keys.pluck(:deploy_key_id) key_ids.push(*DeployKey.are_public.pluck(:id)) DeployKey.where(id: key_ids) end |