diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-13 13:26:31 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-13 13:26:31 +0000 |
| commit | b7dfe2ae4054aa40e15182fd3c6cb7dd39f131db (patch) | |
| tree | 5ab080ca9cadeb6cd9578bf301e4e9e8810bed9e /lib/api/entities.rb | |
| parent | 25cb337cf12438169f1b14bc5dace8a06a7356e3 (diff) | |
| download | gitlab-ce-b7dfe2ae4054aa40e15182fd3c6cb7dd39f131db.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/api/entities.rb')
| -rw-r--r-- | lib/api/entities.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 312c8d5b548..53774d4db1a 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -1780,7 +1780,6 @@ module API end # 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', with_descendants: true) |