Commit f0163d1b authored by Peter Leitzen's avatar Peter Leitzen

Merge branch 'app-serializers' into 'master'

Move prepend to last line in app serializers

See merge request gitlab-org/gitlab!29332
parents e65f1c7a 4cb7d853
# 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')
......@@ -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')
# 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')
---
title: Move prepend to last line in app serializers
merge_request: 29332
author: Rajendra Kadam
type: fixed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment