Return valid response in Projects::MergeRequestsController#ci_status when diff_head_sha is nil

aebca55d · Adam Niedzielski · 6bfa3c93 · aebca55d
Commit aebca55d authored Nov 21, 2016 by Adam Niedzielski
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

app/controllers/projects/merge_requests_controller.rb app/controllers/projects/merge_requests_controller.rb +1 -1

No files found.
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -417,7 +417,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
    response = {
      title: merge_request.title,
-      sha: merge_request.diff_head_commit.short_id,
+      sha: (merge_request.diff_head_commit.short_id if merge_request.diff_head_sha),
      status: status,
      coverage: coverage
    }