summaryrefslogtreecommitdiff
path: root/app/views/admin/runners/show.html.haml
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-12-14 12:34:22 +0000
committerRémy Coutable <remy@rymai.me>2016-12-14 12:34:22 +0000
commit3e90aa1119fc4c77e92e6492f1906f252d90b64e (patch)
treef228f7cecd3f1a488034e4155bcd40a38dd1411d /app/views/admin/runners/show.html.haml
parent3a90612660ab90225907ec6d79032905885c2507 (diff)
parent6757aaa120c375f15e09f4c428286e5dc1d95f84 (diff)
downloadgitlab-ce-3e90aa1119fc4c77e92e6492f1906f252d90b64e.tar.gz
Merge branch 'build-statuses' into 'master'
Detailed build statuses ## What does this MR do? Implements detailed statuses for `Ci::Builds` and `CommitStatus`. It also adds a new icon for manual build. ## Screenshots ![manual_builds_icon](/uploads/22b5c594350856c85398ef705a635f8b/manual_builds_icon.png) ## What are the relevant issue numbers? See #24273, closes #22642 See merge request !7989
Diffstat (limited to 'app/views/admin/runners/show.html.haml')
-rw-r--r--app/views/admin/runners/show.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/admin/runners/show.html.haml b/app/views/admin/runners/show.html.haml
index 73038164056..ca503e35623 100644
--- a/app/views/admin/runners/show.html.haml
+++ b/app/views/admin/runners/show.html.haml
@@ -91,7 +91,7 @@
%strong ##{build.id}
%td.status
- = ci_status_with_icon(build.status)
+ = render 'ci/status/badge', status: build.detailed_status(current_user)
%td.status
- if project