summaryrefslogtreecommitdiff
path: root/app/models/gpg_key.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-05-11 21:10:21 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-05-11 21:10:21 +0000
commit0ae8428c8e77d5d7e098827be688b1f146321af1 (patch)
treecfc80aac796be0dd42ce32a1bd79c8327071993d /app/models/gpg_key.rb
parentf020d5dc9bf42fe27b1451af34e7ab3a0c38d344 (diff)
downloadgitlab-ce-0ae8428c8e77d5d7e098827be688b1f146321af1.tar.gz
Add latest changes from gitlab-org/gitlab@master
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 330815ab8c1..0cb3662368c 100644
--- a/app/models/gpg_key.rb
+++ b/app/models/gpg_key.rb
@@ -128,4 +128,4 @@ class GpgKey < ApplicationRecord
end
end
-GpgKey.prepend_if_ee('EE::GpgKey')
+GpgKey.prepend_mod_with('GpgKey')