diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-24 13:59:01 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-24 13:59:01 +0200 |
| commit | 7aa8e12c549f1fc8bdc90d1ecfc8535a61f2aacb (patch) | |
| tree | 786d5979b0360630ab76f3d8a55d4bec68b0915b | |
| parent | 9da229adc6b88b84ddef637fdbbd03ba573034ea (diff) | |
| parent | c7a7341b5b5a6da001f14d0d09dc70dd6651ec5c (diff) | |
| download | gitlab-ce-7aa8e12c549f1fc8bdc90d1ecfc8535a61f2aacb.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/merge_request_widget.js.coffee | 4 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/widget/_heading.html.haml | 6 |
3 files changed, 9 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index f353a444fba..498ec05fca9 100644 --- a/CHANGELOG +++ b/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) diff --git a/app/assets/javascripts/merge_request_widget.js.coffee b/app/assets/javascripts/merge_request_widget.js.coffee index ca769e06a4e..e4d815bb4e4 100644 --- a/app/assets/javascripts/merge_request_widget.js.coffee +++ b/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') diff --git a/app/views/projects/merge_requests/widget/_heading.html.haml b/app/views/projects/merge_requests/widget/_heading.html.haml index 107c61477e3..4cc9c652b61 100644 --- a/app/views/projects/merge_requests/widget/_heading.html.haml +++ b/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 |