diff options
| author | Alexis Reigel <mail@koffeinfrei.org> | 2017-07-20 16:33:44 +0200 |
|---|---|---|
| committer | Alexis Reigel <mail@koffeinfrei.org> | 2017-07-27 15:46:03 +0200 |
| commit | 57ccff8ea41aa2366f40b29187d3b8d1217264e0 (patch) | |
| tree | 720c3a7457fffa96d9985bf004f303d57ff839fb /app | |
| parent | 786b5a5991930bb838767a4ed6eed2a67e517e82 (diff) | |
| download | gitlab-ce-57ccff8ea41aa2366f40b29187d3b8d1217264e0.tar.gz | |
use db's on_delete instead of has_many :dependent
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/gpg_key.rb | 2 | ||||
| -rw-r--r-- | app/models/user.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/gpg_key.rb b/app/models/gpg_key.rb index da2875a8851..47ebfc9d234 100644 --- a/app/models/gpg_key.rb +++ b/app/models/gpg_key.rb @@ -7,7 +7,7 @@ class GpgKey < ActiveRecord::Base sha_attribute :fingerprint belongs_to :user - has_many :gpg_signatures, dependent: :nullify + has_many :gpg_signatures validates :user, presence: true diff --git a/app/models/user.rb b/app/models/user.rb index 03a76f4fa23..6e66c587a1f 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -76,7 +76,7 @@ class User < ActiveRecord::Base 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 :gpg_keys, dependent: :destroy + has_many :gpg_keys has_many :emails, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent has_many :personal_access_tokens, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent |