diff options
| author | Douwe Maan <douwe@selenight.nl> | 2018-03-28 19:54:31 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2018-03-28 19:54:31 +0300 |
| commit | 931151972189d0d203e2bacedb78638f256a5055 (patch) | |
| tree | 03367c6850e2898757f71eeeffe4502b75d79f74 /app/models/user.rb | |
| parent | 7bca902a23d0cccaa3bce422fce7fdc71e722db4 (diff) | |
Don’t delete deploy key when user who created it is deleted
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index b8c55205ab8..8d5d0bbbfa0 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -82,11 +82,8 @@ class User < ActiveRecord::Base has_one :namespace, -> { where(type: nil) }, dependent: :destroy, foreign_key: :owner_id, inverse_of: :owner, autosave: true # rubocop:disable Cop/ActiveRecordDependent # Profile - has_many :keys, -> do - type = Key.arel_table[:type] - where(type.not_eq('DeployKey').or(type.eq(nil))) - end, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent - has_many :deploy_keys, -> { where(type: 'DeployKey') }, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent + has_many :keys, -> { where(type: ['Key', nil]) }, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent + has_many :deploy_keys, -> { where(type: 'DeployKey') }, dependent: :nullify # rubocop:disable Cop/ActiveRecordDependent has_many :gpg_keys has_many :emails, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent |