summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2017-02-28 20:07:04 +0000
committerFilipa Lacerda <filipa@gitlab.com>2017-02-28 20:07:04 +0000
commit8f3c8448591d9282ece108ba811083d0a662c346 (patch)
treed32a945282c5ac51f04ba9c459075408a8202bce
parentd92b9fefdb8800219aa02f4b9cc34f8ce4df9a26 (diff)
downloadgitlab-ce-fix/gb/improve-merge-request-pipelines-api.tar.gz
-rw-r--r--app/controllers/projects/merge_requests_controller.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index cfe5d39487d..825e8e327a4 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -248,7 +248,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController
render json: {
pipelines: PipelineSerializer
.new(project: @project, user: @current_user)
- .represent(@pipelines) }
+ .represent(@pipelines)
+ }
end
end
end