diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-24 18:09:57 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-24 18:09:57 +0300 |
| commit | 684f46a08299ea2d97358bce974755e8203df2e5 (patch) | |
| tree | c4089575fbb10df6000ea2cdc8d9ca47bbd2ba7d /app/models/gpg_key.rb | |
| parent | a40c1d5046c4102e7cce78b135bebb3539903a73 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/gpg_key.rb')
| -rw-r--r-- | app/models/gpg_key.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/gpg_key.rb b/app/models/gpg_key.rb index 995baf8565c..ca6857a14b6 100644 --- a/app/models/gpg_key.rb +++ b/app/models/gpg_key.rb @@ -127,3 +127,5 @@ class GpgKey < ApplicationRecord end end end + +GpgKey.prepend_if_ee('EE::GpgKey') |