summaryrefslogtreecommitdiff
path: root/lib/api
diff options
context:
space:
mode:
Diffstat (limited to 'lib/api')
-rw-r--r--lib/api/entities/application_setting.rb2
-rw-r--r--lib/api/entities/board.rb2
-rw-r--r--lib/api/entities/group.rb2
-rw-r--r--lib/api/entities/group_detail.rb2
-rw-r--r--lib/api/entities/identity.rb2
-rw-r--r--lib/api/entities/issue.rb2
-rw-r--r--lib/api/entities/issue_basic.rb2
-rw-r--r--lib/api/entities/list.rb2
-rw-r--r--lib/api/entities/member.rb2
-rw-r--r--lib/api/entities/merge_request_basic.rb2
-rw-r--r--lib/api/entities/namespace.rb2
-rw-r--r--lib/api/entities/project.rb (renamed from lib/api/entities.rb)19
-rw-r--r--lib/api/entities/protected_branch.rb2
-rw-r--r--lib/api/entities/protected_ref_access.rb2
-rw-r--r--lib/api/entities/todo.rb2
-rw-r--r--lib/api/entities/user_public.rb2
-rw-r--r--lib/api/entities/user_with_admin.rb2
17 files changed, 33 insertions, 18 deletions
diff --git a/lib/api/entities/application_setting.rb b/lib/api/entities/application_setting.rb
index 6ca2d1e6da4..e9572a8d430 100644
--- a/lib/api/entities/application_setting.rb
+++ b/lib/api/entities/application_setting.rb
@@ -34,3 +34,5 @@ module API
end
end
end
+
+API::Entities::ApplicationSetting.prepend_if_ee('EE::API::Entities::ApplicationSetting')
diff --git a/lib/api/entities/board.rb b/lib/api/entities/board.rb
index afbf5b4b65b..5bb1cde0fa9 100644
--- a/lib/api/entities/board.rb
+++ b/lib/api/entities/board.rb
@@ -12,3 +12,5 @@ module API
end
end
end
+
+API::Entities::Board.prepend_if_ee('EE::API::Entities::Board')
diff --git a/lib/api/entities/group.rb b/lib/api/entities/group.rb
index 8bcad5bca35..ae5ee4784ed 100644
--- a/lib/api/entities/group.rb
+++ b/lib/api/entities/group.rb
@@ -34,3 +34,5 @@ module API
end
end
end
+
+API::Entities::Group.prepend_if_ee('EE::API::Entities::Group', with_descendants: true)
diff --git a/lib/api/entities/group_detail.rb b/lib/api/entities/group_detail.rb
index 97b98aac585..e03047a6e75 100644
--- a/lib/api/entities/group_detail.rb
+++ b/lib/api/entities/group_detail.rb
@@ -34,3 +34,5 @@ module API
end
end
end
+
+API::Entities::GroupDetail.prepend_if_ee('EE::API::Entities::GroupDetail')
diff --git a/lib/api/entities/identity.rb b/lib/api/entities/identity.rb
index 8969a0256c7..52045b6250a 100644
--- a/lib/api/entities/identity.rb
+++ b/lib/api/entities/identity.rb
@@ -7,3 +7,5 @@ module API
end
end
end
+
+API::Entities::Identity.prepend_if_ee('EE::API::Entities::Identity')
diff --git a/lib/api/entities/issue.rb b/lib/api/entities/issue.rb
index b7eb22b2aba..5f2609cf68b 100644
--- a/lib/api/entities/issue.rb
+++ b/lib/api/entities/issue.rb
@@ -46,3 +46,5 @@ module API
end
end
end
+
+API::Entities::Issue.prepend_if_ee('EE::API::Entities::Issue')
diff --git a/lib/api/entities/issue_basic.rb b/lib/api/entities/issue_basic.rb
index 7e4be35d20b..af92f4124f1 100644
--- a/lib/api/entities/issue_basic.rb
+++ b/lib/api/entities/issue_basic.rb
@@ -41,3 +41,5 @@ module API
end
end
end
+
+API::Entities::IssueBasic.prepend_if_ee('EE::API::Entities::IssueBasic', with_descendants: true)
diff --git a/lib/api/entities/list.rb b/lib/api/entities/list.rb
index e856359efc1..480e722c22c 100644
--- a/lib/api/entities/list.rb
+++ b/lib/api/entities/list.rb
@@ -9,3 +9,5 @@ module API
end
end
end
+
+API::Entities::List.prepend_if_ee('EE::API::Entities::List')
diff --git a/lib/api/entities/member.rb b/lib/api/entities/member.rb
index 558f37d1a56..14e97f41e77 100644
--- a/lib/api/entities/member.rb
+++ b/lib/api/entities/member.rb
@@ -9,3 +9,5 @@ module API
end
end
end
+
+API::Entities::Member.prepend_if_ee('EE::API::Entities::Member', with_descendants: true)
diff --git a/lib/api/entities/merge_request_basic.rb b/lib/api/entities/merge_request_basic.rb
index ce8bfa9e670..8cec2c1a97e 100644
--- a/lib/api/entities/merge_request_basic.rb
+++ b/lib/api/entities/merge_request_basic.rb
@@ -92,3 +92,5 @@ module API
end
end
end
+
+API::Entities::MergeRequestBasic.prepend_if_ee('EE::API::Entities::MergeRequestBasic', with_descendants: true)
diff --git a/lib/api/entities/namespace.rb b/lib/api/entities/namespace.rb
index b21dd29c7b4..a7e06cc3e02 100644
--- a/lib/api/entities/namespace.rb
+++ b/lib/api/entities/namespace.rb
@@ -13,3 +13,5 @@ module API
end
end
end
+
+API::Entities::Namespace.prepend_if_ee('EE::API::Entities::Namespace')
diff --git a/lib/api/entities.rb b/lib/api/entities/project.rb
index 479d662f3f5..6ed2ed34360 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities/project.rb
@@ -131,21 +131,4 @@ module API
end
end
-# rubocop: disable Cop/InjectEnterpriseEditionModule
-::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', with_descendants: true)
-::API::Entities::GroupDetail.prepend_if_ee('EE::API::Entities::GroupDetail')
-::API::Entities::IssueBasic.prepend_if_ee('EE::API::Entities::IssueBasic', with_descendants: true)
-::API::Entities::Issue.prepend_if_ee('EE::API::Entities::Issue')
-::API::Entities::List.prepend_if_ee('EE::API::Entities::List')
-::API::Entities::MergeRequestBasic.prepend_if_ee('EE::API::Entities::MergeRequestBasic', with_descendants: true)
-::API::Entities::Member.prepend_if_ee('EE::API::Entities::Member', with_descendants: true)
-::API::Entities::Namespace.prepend_if_ee('EE::API::Entities::Namespace')
-::API::Entities::Project.prepend_if_ee('EE::API::Entities::Project', with_descendants: true)
-::API::Entities::ProtectedRefAccess.prepend_if_ee('EE::API::Entities::ProtectedRefAccess')
-::API::Entities::UserPublic.prepend_if_ee('EE::API::Entities::UserPublic', with_descendants: true)
-::API::Entities::Todo.prepend_if_ee('EE::API::Entities::Todo')
-::API::Entities::ProtectedBranch.prepend_if_ee('EE::API::Entities::ProtectedBranch')
-::API::Entities::Identity.prepend_if_ee('EE::API::Entities::Identity')
-::API::Entities::UserWithAdmin.prepend_if_ee('EE::API::Entities::UserWithAdmin', with_descendants: true)
+API::Entities::Project.prepend_if_ee('EE::API::Entities::Project', with_descendants: true)
diff --git a/lib/api/entities/protected_branch.rb b/lib/api/entities/protected_branch.rb
index e41d497c836..80c8a791053 100644
--- a/lib/api/entities/protected_branch.rb
+++ b/lib/api/entities/protected_branch.rb
@@ -10,3 +10,5 @@ module API
end
end
end
+
+API::Entities::ProtectedBranch.prepend_if_ee('EE::API::Entities::ProtectedBranch')
diff --git a/lib/api/entities/protected_ref_access.rb b/lib/api/entities/protected_ref_access.rb
index ab878be45d2..f0185705b06 100644
--- a/lib/api/entities/protected_ref_access.rb
+++ b/lib/api/entities/protected_ref_access.rb
@@ -10,3 +10,5 @@ module API
end
end
end
+
+API::Entities::ProtectedRefAccess.prepend_if_ee('EE::API::Entities::ProtectedRefAccess')
diff --git a/lib/api/entities/todo.rb b/lib/api/entities/todo.rb
index 820d1ceaadd..abfdde89bf1 100644
--- a/lib/api/entities/todo.rb
+++ b/lib/api/entities/todo.rb
@@ -44,3 +44,5 @@ module API
end
end
end
+
+API::Entities::Todo.prepend_if_ee('EE::API::Entities::Todo')
diff --git a/lib/api/entities/user_public.rb b/lib/api/entities/user_public.rb
index 100f73760ca..15e9b905bef 100644
--- a/lib/api/entities/user_public.rb
+++ b/lib/api/entities/user_public.rb
@@ -17,3 +17,5 @@ module API
end
end
end
+
+API::Entities::UserPublic.prepend_if_ee('EE::API::Entities::UserPublic', with_descendants: true)
diff --git a/lib/api/entities/user_with_admin.rb b/lib/api/entities/user_with_admin.rb
index c2f873ae802..d3df12200ff 100644
--- a/lib/api/entities/user_with_admin.rb
+++ b/lib/api/entities/user_with_admin.rb
@@ -7,3 +7,5 @@ module API
end
end
end
+
+API::Entities::UserWithAdmin.prepend_if_ee('EE::API::Entities::UserWithAdmin', with_descendants: true)
View Lorry Controller Status