diff options
author | Nick Thomas <nick@gitlab.com> | 2017-06-07 18:57:47 +0300 |
---|---|---|
committer | Nick Thomas <nick@gitlab.com> | 2017-06-07 18:57:47 +0300 |
commit | c84c35810bf378b6b4cb06ec350a507909089086 (patch) | |
tree | 08908a811eda73a6976804787c61eee3cc682179 /app/serializers | |
parent | 217fb6846d7f9a1fe7a0c8db26bde5556637d0c4 (diff) |
Resolve simple conflicts in app/, excluding views
Diffstat (limited to 'app/serializers')
-rw-r--r-- | app/serializers/pipeline_details_entity.rb | 9 | ||||
-rw-r--r-- | app/serializers/pipeline_serializer.rb | 6 |
2 files changed, 1 insertions, 14 deletions
diff --git a/app/serializers/pipeline_details_entity.rb b/app/serializers/pipeline_details_entity.rb index b1cda1b127a..17d4aaec41d 100644 --- a/app/serializers/pipeline_details_entity.rb +++ b/app/serializers/pipeline_details_entity.rb @@ -1,17 +1,10 @@ class PipelineDetailsEntity < PipelineEntity expose :details do -<<<<<<< HEAD - expose :stages, using: StageEntity + expose :legacy_stages, as: :stages, using: StageEntity expose :artifacts, using: BuildArtifactEntity expose :manual_actions, using: BuildActionEntity end expose :triggered_by_pipeline, as: :triggered_by, with: TriggeredPipelineEntity expose :triggered_pipelines, as: :triggered, using: TriggeredPipelineEntity -======= - expose :legacy_stages, as: :stages, using: StageEntity - expose :artifacts, using: BuildArtifactEntity - expose :manual_actions, using: BuildActionEntity - end ->>>>>>> ce/master end diff --git a/app/serializers/pipeline_serializer.rb b/app/serializers/pipeline_serializer.rb index bd122372754..8f152ffe1d7 100644 --- a/app/serializers/pipeline_serializer.rb +++ b/app/serializers/pipeline_serializer.rb @@ -19,17 +19,11 @@ class PipelineSerializer < BaseSerializer :cancelable_statuses, :trigger_requests, :project, -<<<<<<< HEAD { triggered_by_pipeline: [:project, :user] }, { triggered_pipelines: [:project, :user] }, - { pending_builds: :project }, - { manual_actions: :project }, - { artifacts: :project } -======= :manual_actions, :artifacts, { pending_builds: :project } ->>>>>>> ce/master ]) end |