From b7dfe2ae4054aa40e15182fd3c6cb7dd39f131db Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Fri, 13 Sep 2019 13:26:31 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 app/models/key.rb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'app/models/key.rb')

diff --git a/app/models/key.rb b/app/models/key.rb
index 8aa25924c28..ff601966c26 100644
--- a/app/models/key.rb
+++ b/app/models/key.rb
@@ -140,3 +140,5 @@ class Key < ApplicationRecord
     "type is forbidden. Must be #{allowed_types}"
   end
 end
+
+Key.prepend_if_ee('EE::Key')
-- 
cgit v1.2.1