diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2021-01-20 13:34:23 -0600 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2021-01-20 13:34:23 -0600 |
| commit | 6438df3a1e0fb944485cebf07976160184697d72 (patch) | |
| tree | 00b09bfd170e77ae9391b1a2f5a93ef6839f2597 /app/models/gpg_key.rb | |
| parent | 42bcd54d971da7ef2854b896a7b34f4ef8601067 (diff) | |
| download | gitlab-ce-6438df3a1e0fb944485cebf07976160184697d72.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42
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') |