Resolve simple conflicts in app/, excluding views

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