summaryrefslogtreecommitdiff
path: root/lib/api
diff options
context:
space:
mode:
authorWinnie Hellmann <winnie@gitlab.com>2019-08-27 09:01:26 +0200
committerWinnie Hellmann <winnie@gitlab.com>2019-08-27 11:05:56 +0200
commit16c1cd66a5679a91aee14161490779ce92934c61 (patch)
treec32cc06324811bc4eb0c95851ecb902910eea10f /lib/api
parentb0f256d8ad0af9b75480cf6d562df8e4bac6ca37 (diff)
downloadgitlab-ce-16c1cd66a5679a91aee14161490779ce92934c61.tar.gz
Disable InjectEnterpriseEditionModule for lib/api/entities.rb
(cherry picked from commit a9454734d851ecc6d9e4a86cd667a33a492fdef9)
Diffstat (limited to 'lib/api')
-rw-r--r--lib/api/entities.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 35f5a4745f0..b4990df1eb6 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -1708,7 +1708,8 @@ module API
end
end
-API::Entities.prepend_if_ee('EE::API::Entities::Entities') # rubocop: disable Cop/InjectEnterpriseEditionModule
+# rubocop: disable Cop/InjectEnterpriseEditionModule
+API::Entities.prepend_if_ee('EE::API::Entities::Entities')
::API::Entities::ApplicationSetting.prepend_if_ee('EE::API::Entities::ApplicationSetting')
::API::Entities::Board.prepend_if_ee('EE::API::Entities::Board')
::API::Entities::Group.prepend_if_ee('EE::API::Entities::Group')