diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-14 03:08:27 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-14 03:08:27 +0300 |
| commit | b7d58ff8b17623f64ac7835a590e79d916e758ac (patch) | |
| tree | 4f75a8f9e0e30cf8c7e944ea2c4461be396c0d5f /app/views/projects | |
| parent | 0e2fc1701bd0c87cc458cbbb34c618b0e0dc5a14 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/pipelines/_info.html.haml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/views/projects/pipelines/_info.html.haml b/app/views/projects/pipelines/_info.html.haml index 4eec81c9125..ce6ae765de9 100644 --- a/app/views/projects/pipelines/_info.html.haml +++ b/app/views/projects/pipelines/_info.html.haml @@ -20,6 +20,11 @@ .well-segment.qa-pipeline-badges .icon-container = 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? %span.js-pipeline-url-latest.badge.badge-success.has-tooltip{ title: _("Latest pipeline for the most recent commit on this branch") } latest |