diff options
| author | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-01-20 18:54:06 -0500 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-03-18 10:26:48 +0000 |
| commit | 91880e13df19ed312bfa0a2e06743dd8a71aa1ad (patch) | |
| tree | 6796d167cf557a44d2c3eb0c24032040eb53446b /app/controllers/projects/merge_requests_controller.rb | |
| parent | fde975facc37c7d2f7ea5c997624bc7c0f5759a8 (diff) | |
| download | gitlab-ce-91880e13df19ed312bfa0a2e06743dd8a71aa1ad.tar.gz | |
initial ajax build
Diffstat (limited to 'app/controllers/projects/merge_requests_controller.rb')
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 3 |
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 61b82c9db46..861ae7ee2f7 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -228,7 +228,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController response = { status: status, - coverage: coverage + coverage: coverage, + ci_status: @merge_request.ci_commit.status } render json: response |