diff options
| author | Shinya Maeda <gitlab.shinyamaeda@gmail.com> | 2017-03-21 22:21:13 +0900 |
|---|---|---|
| committer | Shinya Maeda <gitlab.shinyamaeda@gmail.com> | 2017-03-23 17:11:49 +0900 |
| commit | a375d80eb072d62962af9b6f2decf9782cd7ee1f (patch) | |
| tree | 4cea31ebfcac1b9dcc42ea51a951588fcecc53ce /app/controllers/projects/merge_requests_controller.rb | |
| parent | 6dcd2d591fa00be027b92e8c0e6b3b129921f4fa (diff) | |
| download | gitlab-ce-a375d80eb072d62962af9b6f2decf9782cd7ee1f.tar.gz | |
Use detailed_status effectively. Remove unnecesarry context(nest). Add new context in merge_requests_controller_spec.rb and fix a bug. Correct description of spec.
Diffstat (limited to 'app/controllers/projects/merge_requests_controller.rb')
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 165035285f4..6a116f99f13 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -474,6 +474,7 @@ 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) |