Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

CHANGELOG

@@ -16,6 +16,7 @@ v 7.13.0 (unreleased)
   - API request /projects/:project_id/merge_requests?state=closed will return only closed merge requests without merged one. If you need ones that were merged - use state=merged.  
   - Allow Administrators to filter the user list by those with or without Two-factor Authentication enabled.
   - Show a user's Two-factor Authentication status in the administration area.
+  - Explicit error when commit not found in the CI
 
 v 7.12.0 (unreleased)
   - Fix Error 500 when one user attempts to access a personal, internal snippet (Stan Hu)

app/assets/javascripts/merge_request_widget.js.coffee

@@ -36,11 +36,11 @@ class @MergeRequestWidget
 
   showCiState: (state) ->
     $('.ci_widget').hide()
-    allowed_states = ["failed", "canceled", "running", "pending", "success"]
+    allowed_states = ["failed", "canceled", "running", "pending", "success", "not_found"]
     if state in allowed_states
       $('.ci_widget.ci-' + state).show()
       switch state
-        when "failed", "canceled"
+        when "failed", "canceled", "not_found"
           @setMergeButtonClass('btn-danger')
         when "running", "pending"
           @setMergeButtonClass('btn-warning')

app/views/projects/merge_requests/widget/_heading.html.haml

@@ -23,6 +23,12 @@
       = icon("spinner spin")
       Checking for CI status for #{@merge_request.last_commit_short_sha}
 
+    .ci_widget.ci-not_found{style: "display:none"}
+      = icon("times")
+      %span Can not find commit in the CI server
+      for #{@merge_request.last_commit_short_sha}.
+      
+
     .ci_widget.ci-canceled{style: "display:none"}
       = icon("times")
       %span CI build canceled