diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-12 21:09:39 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-12 21:09:39 +0000 |
| commit | cdf9ef52fe13899be29068992a9858f8b0e72457 (patch) | |
| tree | d26b77d147c1a8506213c05048f026fe9ef8ad1e /app/serializers | |
| parent | 13150a38e701080f6c64d4925c838214a3f5ef2c (diff) | |
| download | gitlab-ce-cdf9ef52fe13899be29068992a9858f8b0e72457.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/build_details_entity.rb | 4 | ||||
| -rw-r--r-- | app/serializers/issue_entity.rb | 3 | ||||
| -rw-r--r-- | app/serializers/project_mirror_entity.rb | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/app/serializers/build_details_entity.rb b/app/serializers/build_details_entity.rb index fe6afa4ff6f..df1bdc2b7a4 100644 --- a/app/serializers/build_details_entity.rb +++ b/app/serializers/build_details_entity.rb @@ -1,8 +1,6 @@ # frozen_string_literal: true class BuildDetailsEntity < JobEntity - prepend_if_ee('::EE::BuildDetailEntity') # rubocop: disable Cop/InjectEnterpriseEditionModule - expose :coverage, :erased_at, :duration expose :tag_list, as: :tags expose :has_trace?, as: :has_trace @@ -152,3 +150,5 @@ class BuildDetailsEntity < JobEntity _("Please refer to <a href=\"%{docs_url}\">%{docs_url}</a>") % { docs_url: docs_url } end end + +BuildDetailsEntity.prepend_if_ee('::EE::BuildDetailEntity') diff --git a/app/serializers/issue_entity.rb b/app/serializers/issue_entity.rb index 98c0c703584..7c12e0956f3 100644 --- a/app/serializers/issue_entity.rb +++ b/app/serializers/issue_entity.rb @@ -2,7 +2,6 @@ class IssueEntity < IssuableEntity include TimeTrackableEntity - prepend_if_ee('::EE::IssueEntity') # rubocop: disable Cop/InjectEnterpriseEditionModule expose :state expose :milestone_id @@ -73,3 +72,5 @@ class IssueEntity < IssuableEntity help_page_path('user/project/settings/index.md', anchor: 'archiving-a-project') end end + +IssueEntity.prepend_if_ee('::EE::IssueEntity') diff --git a/app/serializers/project_mirror_entity.rb b/app/serializers/project_mirror_entity.rb index 2efd820d893..daea209deb4 100644 --- a/app/serializers/project_mirror_entity.rb +++ b/app/serializers/project_mirror_entity.rb @@ -1,11 +1,11 @@ # frozen_string_literal: true class ProjectMirrorEntity < Grape::Entity - prepend_if_ee('::EE::ProjectMirrorEntity') # rubocop: disable Cop/InjectEnterpriseEditionModule - expose :id expose :remote_mirrors_attributes, using: RemoteMirrorEntity do |project| project.remote_mirrors end end + +ProjectMirrorEntity.prepend_if_ee('::EE::ProjectMirrorEntity') |