summaryrefslogtreecommitdiff
path: root/app/models/gpg_key.rb
diff options
context:
space:
mode:
authorRubén Dávila <ruben@gitlab.com>2017-09-27 12:27:39 -0500
committerRubén Dávila <ruben@gitlab.com>2017-10-05 08:25:27 -0500
commit328f4a505bcd2e7b38f907a24df437f8c35bc3af (patch)
tree7b1f8ae20ef5bd9e57fe0dc0848b358dad2a5403 /app/models/gpg_key.rb
parent37dcfb6e31a65d487424c0bf73874aabb2e69020 (diff)
downloadgitlab-ce-328f4a505bcd2e7b38f907a24df437f8c35bc3af.tar.gz
Use a separate model to handle GPG subkeys
Diffstat (limited to 'app/models/gpg_key.rb')
-rw-r--r--app/models/gpg_key.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/gpg_key.rb b/app/models/gpg_key.rb
index 683efcebee9..110ff4ee59c 100644
--- a/app/models/gpg_key.rb
+++ b/app/models/gpg_key.rb
@@ -10,7 +10,7 @@ class GpgKey < ActiveRecord::Base
belongs_to :user
belongs_to :parent, class_name: 'GpgKey'
has_many :gpg_signatures
- has_many :subkeys, class_name: 'GpgKey', foreign_key: :parent_id, dependent: :destroy
+ has_many :subkeys, class_name: 'GpgKeySubkey'
validates :user, presence: true