Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone <annabel.dunstone@gmail.com>2016-07-27 19:51:52 +0300
committerAnnabel Dunstone <annabel.dunstone@gmail.com>2016-07-28 20:45:35 +0300
commitd49e6f355010a31a080da75789b46603989925ad (patch)
treefbd708ea22460aca050379c80e162c75ab0eee6f /app/views/admin
parent15654eca7f7db7176281ce4fd23504b09bd930a4 (diff)
Add pipeline icon to admin builds; position warning icon after sha
Diffstat (limited to 'app/views/admin')
-rw-r--r--app/views/admin/builds/_build.html.haml7
1 files changed, 4 insertions, 3 deletions
diff --git a/app/views/admin/builds/_build.html.haml b/app/views/admin/builds/_build.html.haml
index ce818c30c30..6d1ccf32b56 100644
--- a/app/views/admin/builds/_build.html.haml
+++ b/app/views/admin/builds/_build.html.haml
@@ -11,16 +11,17 @@
- else
%span.build-link ##{build.id}
- - if build.stuck?
- %i.fa.fa-warning.text-warning
-
- if build.ref
+ .icon-container
+ = build.tag? ? icon('tag') : icon('code-fork')
= link_to build.ref, namespace_project_commits_path(build.project.namespace, build.project, build.ref), class: "monospace branch-name"
- else
.light none
= custom_icon("icon_commit")
= link_to build.short_sha, namespace_project_commit_path(build.project.namespace, build.project, build.sha), class: "monospace commit-id"
+ - if build.stuck?
+ %i.fa.fa-warning.text-warning
.label-container
- if build.tags.any?