fix conflict

b49a3f1e · Regis · b0c6037a · 6b52adc6 · b49a3f1e
隐藏空白更改
内联并排

Showing with 5 addition and 0 deletion

app/controllers/projects/pipelines_controller.rb app/controllers/projects/pipelines_controller.rb +5 -0

未找到文件。
--- a/app/controllers/projects/pipelines_controller.rb
+++ b/app/controllers/projects/pipelines_controller.rb
@@ -18,11 +18,16 @@ class Projects::PipelinesController < Projects::ApplicationController
      format.json do
         render json: {
           pipelines: PipelineSerializer
+<<<<<<< HEAD
             .incremental(
                project: @project,
                user: @current_user,
                last_updated: @last_updated)
             .represent
+=======
+             .new(project: @project, user: @current_user)
+             .incremental(@pipelines, @last_updated),
+>>>>>>> 6b52adc661896434d3fea1fd7f83c62bef2456a6
           updated_at: Time.now,
           count: {
             all: @pipelines_count,