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:
authorFatih Acet <acetfatih@gmail.com>2016-07-19 15:47:09 +0300
committerFatih Acet <acetfatih@gmail.com>2016-07-19 15:47:09 +0300
commit72cc43df1cce899e22317ffe5a45a1692789eee0 (patch)
tree9e0a2d72231afa2026709c51cd51a9acf0c30a20 /app/views/projects/ci
parent1e81ab7c8c02e126b6fd8f6148661d0a342d9937 (diff)
parentadd3767db14d12e3655f9d5e04de33700318d5dd (diff)
Merge branch '19751-branch-tag-icons' into 'master'
Resolve "Add icons for branch and tag in pipeline list" ## What does this MR do? Adds branch or tag icon on pipeline ref ## What are the relevant issue numbers? Closes #19751 Part of #18920 ## Screenshots (if relevant) ![Screen_Shot_2016-07-13_at_1.42.54_PM](/uploads/d90706a76cf87a6cc8c25dca9a71affa/Screen_Shot_2016-07-13_at_1.42.54_PM.png) With icons closer to tag/branch name/sha: ![Screen_Shot_2016-07-15_at_11.23.48_AM](/uploads/411338f811bafbd314dbab5553fa46d4/Screen_Shot_2016-07-15_at_11.23.48_AM.png) See merge request !5239
Diffstat (limited to 'app/views/projects/ci')
-rw-r--r--app/views/projects/ci/pipelines/_pipeline.html.haml9
1 files changed, 5 insertions, 4 deletions
diff --git a/app/views/projects/ci/pipelines/_pipeline.html.haml b/app/views/projects/ci/pipelines/_pipeline.html.haml
index 0557d384e33..7ae699832f6 100644
--- a/app/views/projects/ci/pipelines/_pipeline.html.haml
+++ b/app/views/projects/ci/pipelines/_pipeline.html.haml
@@ -10,12 +10,13 @@
= link_to namespace_project_pipeline_path(@project.namespace, @project, pipeline.id) do
%span ##{pipeline.id}
- if pipeline.ref
+ .icon-container
+ = pipeline.tag? ? icon('tag') : icon('code-fork')
= link_to pipeline.ref, namespace_project_commits_path(@project.namespace, @project, pipeline.ref), class: "monospace branch-name"
- = custom_icon("icon_commit")
+ .icon-container
+ = custom_icon("icon_commit")
= link_to pipeline.short_sha, namespace_project_commit_path(@project.namespace, @project, pipeline.sha), class: "commit-id monospace"
- - if pipeline.tag?
- %span.label.label-primary tag
- - elsif pipeline.latest?
+ - if pipeline.latest?
%span.label.label-success.has-tooltip{ title: 'Latest build for this branch' } latest
- if pipeline.triggered?
%span.label.label-primary triggered