BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit b49a3f1e by Regis
Options

fix conflict

parents b0c6037a 6b52adc6
Showing with 5 additions and 0 deletions
app/controllers/projects/pipelines_controller.rb
...@@ -18,11 +18,16 @@ class Projects::PipelinesController < Projects::ApplicationController ...@@ -18,11 +18,16 @@ class Projects::PipelinesController < Projects::ApplicationController
format.json do format.json do
render json: { render json: {
pipelines: PipelineSerializer pipelines: PipelineSerializer
<<<<<<< HEAD
.incremental( .incremental(
project: @project, project: @project,
user: @current_user, user: @current_user,
last_updated: @last_updated) last_updated: @last_updated)
.represent .represent
=======
.new(project: @project, user: @current_user)
.incremental(@pipelines, @last_updated),
>>>>>>> 6b52adc661896434d3fea1fd7f83c62bef2456a6
updated_at: Time.now, updated_at: Time.now,
count: { count: {
all: @pipelines_count, all: @pipelines_count,
......
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