Merge branch 'ci-skipped-status' into 'master'

Added support for CI skipped status

This is required to support: https://gitlab.com/gitlab-org/gitlab-ci/merge_requests/216


See merge request !1073

CHANGELOG

@@ -31,6 +31,7 @@ v 7.14.0 (unreleased)
   - Disabled autocapitalize and autocorrect on login field (Daryl Chan)
   - Mention group and project name in creation, update and deletion notices (Achilleas Pipinellis)
   - Remove redis-store TTL monkey patch
+  - Add support for CI skipped status
 
 v 7.13.2
   - Fix randomly failed spec

app/assets/javascripts/merge_request_widget.js.coffee

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

app/assets/stylesheets/pages/merge_requests.scss

@@ -139,6 +139,11 @@
       color: $gl-success;
     }
 
+    &.ci-skipped {
+      background-color: #eee;
+      color: #888;
+    }
+
     &.ci-pending,
     &.ci-running {
       color: $gl-warning;

app/models/project_services/ci_service.rb

@@ -41,7 +41,7 @@ class CiService < Service
 
   # Return string with build status or :error symbol
   #
-  # Allowed states: 'success', 'failed', 'running', 'pending'
+  # Allowed states: 'success', 'failed', 'running', 'pending', 'skipped'
   #
   #
   # Ex.

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

@@ -6,6 +6,12 @@
       for #{@merge_request.last_commit_short_sha}.
       = link_to "View build page", ci_build_details_path(@merge_request), :"data-no-turbolink" => "data-no-turbolink"
 
+    .ci_widget.ci-skipped{style: "display:none"}
+      = icon("check")
+      %span CI build skipped
+      for #{@merge_request.last_commit_short_sha}.
+      = link_to "View build page", ci_build_details_path(@merge_request), :"data-no-turbolink" => "data-no-turbolink"
+
     .ci_widget.ci-failed{style: "display:none"}
       = icon("times")
       %span CI build failed