Updated based on feedback

1 files changed, 34 insertions, 20 deletions

diff --git a/app/views/projects/merge_requests/widget/_heading.html.haml b/app/views/projects/merge_requests/widget/_heading.html.haml
index 2ee8e2de0e8..2ec0d20a879 100644
--- a/app/views/projects/merge_requests/widget/_heading.html.haml
+++ b/app/views/projects/merge_requests/widget/_heading.html.haml
@@ -1,12 +1,24 @@
-- if @ci_commit or @merge_request.has_ci?
+- if @ci_commit
   .mr-widget-heading
-    - if @merge_request.has_ci?
-      .ci_widget.ci-widget-fetching
-        = icon('spinner spin')
+    - %w[success skipped canceled failed running pending].each do |status|
+      .ci_widget{ class: "ci-#{status}", style: ("display:none" unless @ci_commit.status == status) }
+        = ci_icon_for_status(status)
         %span
-          Checking CI status for #{@merge_request.last_commit_short_sha}…
+          CI build
+          = ci_label_for_status(status)
+        for
+        - commit = @merge_request.last_commit
+        = succeed "." do
+          = link_to @ci_commit.short_sha, namespace_project_commit_path(@merge_request.source_project.namespace, @merge_request.source_project, @ci_commit.sha), class: "monospace"
+        %span.ci-coverage
+        = link_to "View details", builds_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: "js-show-tab", data: {action: 'builds'}
+
+- elsif @merge_request.has_ci?
+  - # Compatibility with old CI integrations (ex jenkins) when you request status from CI server via AJAX
+  - # Remove in later versions when services like Jenkins will set CI status via Commit status API
+  .mr-widget-heading
     - %w[success skipped canceled failed running pending].each do |status|
-      .ci_widget{ class: "ci-#{status}", style: ("display:none" unless status == @ci_commit.status) }
+      .ci_widget{class: "ci-#{status}", style: "display:none"}
         = ci_icon_for_status(status)
         %span
           CI build
@@ -16,20 +28,22 @@
         = succeed "." do
           = link_to commit.short_id, namespace_project_commit_path(@merge_request.source_project.namespace, @merge_request.source_project, commit), class: "monospace"
         %span.ci-coverage
-        - if details_path = builds_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)
+        - if details_path = ci_build_details_path(@merge_request)
           = link_to "View details", details_path, :"data-no-turbolink" => "data-no-turbolink"
-    - if @merge_request.has_ci?
-      - # Compatibility with old CI integrations (ex jenkins) when you request status from CI server via AJAX
-      - # Remove in later versions when services like Jenkins will set CI status via Commit status API
-      .ci_widget.ci-not_found{style: "display:none"}
-        = icon("times-circle")
-        Could not find CI status for #{@merge_request.last_commit_short_sha}.
 
-      .ci_widget.ci-error{style: "display:none"}
-        = icon("times-circle")
-        Could not connect to the CI server. Please check your settings and try again.
+    .ci_widget
+      = icon("spinner spin")
+      Checking CI status for #{@merge_request.last_commit_short_sha}…
+
+    .ci_widget.ci-not_found{style: "display:none"}
+      = icon("times-circle")
+      Could not find CI status for #{@merge_request.last_commit_short_sha}.
+
+    .ci_widget.ci-error{style: "display:none"}
+      = icon("times-circle")
+      Could not connect to the CI server. Please check your settings and try again.
 
-      :javascript
-        $(function() {
-          merge_request_widget.getCIState();
-        });
+  :javascript
+    $(function() {
+      merge_request_widget.getCIStatus(false);
+    });