diff options
| author | Shinya Maeda <gitlab.shinyamaeda@gmail.com> | 2017-03-23 17:18:11 +0900 |
|---|---|---|
| committer | Shinya Maeda <gitlab.shinyamaeda@gmail.com> | 2017-03-23 17:18:11 +0900 |
| commit | 1d75989551090ce1f21984cb2630e29493d9065b (patch) | |
| tree | 3806babe013057f71da58dd9de202c71437ba84c | |
| parent | a375d80eb072d62962af9b6f2decf9782cd7ee1f (diff) | |
| download | gitlab-ce-1d75989551090ce1f21984cb2630e29493d9065b.tar.gz | |
Move conditional statement to PipelineSerializer#represent_status
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 1 | ||||
| -rw-r--r-- | app/serializers/pipeline_serializer.rb | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 6a116f99f13..165035285f4 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -474,7 +474,6 @@ class Projects::MergeRequestsController < Projects::ApplicationController end def pipeline_status - render json: {} and return unless @merge_request.head_pipeline.present? render json: PipelineSerializer .new(project: @project, user: @current_user) .represent_status(@merge_request.head_pipeline) diff --git a/app/serializers/pipeline_serializer.rb b/app/serializers/pipeline_serializer.rb index 412390737cb..0094e3f4114 100644 --- a/app/serializers/pipeline_serializer.rb +++ b/app/serializers/pipeline_serializer.rb @@ -24,6 +24,7 @@ class PipelineSerializer < BaseSerializer end def represent_status(resource) + return {} unless resource.present? data = represent(resource, { only: [{ details: [:status] }] }) data.dig(:details, :status) || {} end |