diff options
| author | Vinnie Okada <vokada@mrvinn.com> | 2015-03-21 18:03:35 +0300 |
|---|---|---|
| committer | Vinnie Okada <vokada@mrvinn.com> | 2015-03-21 18:03:35 +0300 |
| commit | f5e65e2e508269ff7c18318526ba01f8e7d83951 (patch) | |
| tree | dd834b066dc51de87139d69ea042e0bdfd69334d /app/views/projects/merge_requests/show/_mr_ci.html.haml | |
| parent | cc29ce491786d631586c3b0d0da310b8b790a673 (diff) | |
| parent | 6cf189f0a92772b9174f913e7c74a4889d54e9a6 (diff) | |
Merge branch 'master' into markdown-tags
Merge updated CHANGELOG entries
Diffstat (limited to 'app/views/projects/merge_requests/show/_mr_ci.html.haml')
| -rw-r--r-- | app/views/projects/merge_requests/show/_mr_ci.html.haml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/views/projects/merge_requests/show/_mr_ci.html.haml b/app/views/projects/merge_requests/show/_mr_ci.html.haml index 85a7103f3bc..ffa3f7b0e36 100644 --- a/app/views/projects/merge_requests/show/_mr_ci.html.haml +++ b/app/views/projects/merge_requests/show/_mr_ci.html.haml @@ -23,6 +23,12 @@ %i.fa.fa-spinner Checking for CI status for #{@merge_request.last_commit_short_sha} + .ci_widget.ci-canceled{style: "display:none"} + %i.fa.fa-times + %span CI build canceled + 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-error{style: "display:none"} %i.fa.fa-times %span Cannot connect to the CI server. Please check your settings and try again. |