diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-02-13 19:08:06 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2017-02-13 19:08:06 +0000 |
commit | 99df355ec2d6a934620254423f2a9451b88c6ab4 (patch) | |
tree | 105863d867b5fa48b95ac175d6fa857cca9f3e65 /app | |
parent | 49e44d88b90939ece219e2cffc11119854306bd9 (diff) | |
parent | e31b982a13413151dd7317ee15aadcbde0f72edb (diff) | |
download | gitlab-ce-99df355ec2d6a934620254423f2a9451b88c6ab4.tar.gz |
Merge branch '27480_deploy_keys_should_not_show_up_in_users_keys_list' into 'master'
Make deploy key not show in User's keys list
Closes #27480
See merge request !9024
Diffstat (limited to 'app')
-rw-r--r-- | app/models/user.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 867e61af56a..1649bf04eaa 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -51,7 +51,12 @@ class User < ActiveRecord::Base has_one :namespace, -> { where type: nil }, dependent: :destroy, foreign_key: :owner_id # Profile - has_many :keys, dependent: :destroy + has_many :keys, -> do + type = Key.arel_table[:type] + where(type.not_eq('DeployKey').or(type.eq(nil))) + end, dependent: :destroy + has_many :deploy_keys, -> { where(type: 'DeployKey') }, dependent: :destroy + has_many :emails, dependent: :destroy has_many :personal_access_tokens, dependent: :destroy has_many :identities, dependent: :destroy, autosave: true |