Commit 28a01b68 authored by Mike Greiling's avatar Mike Greiling

Merge branch 'commit-box-child-label' into 'master'

Add child label to commit box (2/3)

See merge request gitlab-org/gitlab!21323
parents f2c29115 d739b2cc
...@@ -502,6 +502,10 @@ module Ci ...@@ -502,6 +502,10 @@ module Ci
builds.skipped.after_stage(stage_idx).find_each(&:process) builds.skipped.after_stage(stage_idx).find_each(&:process)
end end
def child?
false
end
def latest? def latest?
return false unless git_ref && commit.present? return false unless git_ref && commit.present?
......
...@@ -20,6 +20,11 @@ ...@@ -20,6 +20,11 @@
.well-segment.qa-pipeline-badges .well-segment.qa-pipeline-badges
.icon-container .icon-container
= sprite_icon('flag') = sprite_icon('flag')
- if @pipeline.child?
%span.js-pipeline-child.badge.badge-primary.has-tooltip{ title: s_("Pipelines|This is a child pipeline within the parent pipeline") }
= s_('Pipelines|Child pipeline')
= surround '(', ')' do
= link_to s_('Pipelines|parent'), pipeline_path(@pipeline.triggered_by_pipeline), class: 'text-white text-underline'
- if @pipeline.latest? - if @pipeline.latest?
%span.js-pipeline-url-latest.badge.badge-success.has-tooltip{ title: _("Latest pipeline for the most recent commit on this branch") } %span.js-pipeline-url-latest.badge.badge-success.has-tooltip{ title: _("Latest pipeline for the most recent commit on this branch") }
latest latest
......
---
title: Add child label to commit box
merge_request: 21323
author:
type: added
...@@ -12719,6 +12719,9 @@ msgstr "" ...@@ -12719,6 +12719,9 @@ msgstr ""
msgid "Pipelines|CI Lint" msgid "Pipelines|CI Lint"
msgstr "" msgstr ""
msgid "Pipelines|Child pipeline"
msgstr ""
msgid "Pipelines|Clear Runner Caches" msgid "Pipelines|Clear Runner Caches"
msgstr "" msgstr ""
...@@ -12752,9 +12755,15 @@ msgstr "" ...@@ -12752,9 +12755,15 @@ msgstr ""
msgid "Pipelines|There was an error fetching the pipelines. Try again in a few moments or contact your support team." msgid "Pipelines|There was an error fetching the pipelines. Try again in a few moments or contact your support team."
msgstr "" msgstr ""
msgid "Pipelines|This is a child pipeline within the parent pipeline"
msgstr ""
msgid "Pipelines|This project is not currently set up to run pipelines." msgid "Pipelines|This project is not currently set up to run pipelines."
msgstr "" msgstr ""
msgid "Pipelines|parent"
msgstr ""
msgid "Pipeline|Commit" msgid "Pipeline|Commit"
msgstr "" msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment