summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorWinnie Hellmann <winnie@gitlab.com>2019-08-27 15:11:15 +0000
committerYorick Peterse <yorickpeterse@gmail.com>2019-08-27 15:11:15 +0000
commit75353242e2a2925fa968a3f9a5ad1db051a194cd (patch)
tree7d43a433da9ee80615f7ad40ca031d145825ff40 /config
parent3cf15156229547c8283700cb3d035da8f7000be6 (diff)
downloadgitlab-ce-75353242e2a2925fa968a3f9a5ad1db051a194cd.tar.gz
Replace prepend_entity with prepend_if_ee
(cherry picked from commit 897a9d308db46b620b738b98f2b0e5630ac7d2dd)
Diffstat (limited to 'config')
-rw-r--r--config/initializers/0_inject_enterprise_edition_module.rb11
1 files changed, 9 insertions, 2 deletions
diff --git a/config/initializers/0_inject_enterprise_edition_module.rb b/config/initializers/0_inject_enterprise_edition_module.rb
index 39595e23abe..b3ebb44ef25 100644
--- a/config/initializers/0_inject_enterprise_edition_module.rb
+++ b/config/initializers/0_inject_enterprise_edition_module.rb
@@ -3,8 +3,15 @@
require 'active_support/inflector'
module InjectEnterpriseEditionModule
- def prepend_if_ee(constant)
- prepend(constant.constantize) if Gitlab.ee?
+ def prepend_if_ee(constant, with_descendants: false)
+ return unless Gitlab.ee?
+
+ ee_module = constant.constantize
+ prepend(ee_module)
+
+ if with_descendants
+ descendants.each { |descendant| descendant.prepend(ee_module) }
+ end
end
def extend_if_ee(constant)