Fix job to pipeline renaming
This commit is contained in:
parent
01c2a50fa2
commit
fd2e3da05a
5 changed files with 11 additions and 7 deletions
|
@ -15,7 +15,7 @@
|
|||
- else
|
||||
%span.api.monospace API
|
||||
- if pipeline.latest?
|
||||
%span.label.label-success.has-tooltip{ title: 'Latest job for this branch' } latest
|
||||
%span.label.label-success.has-tooltip{ title: 'Latest pipeline for this branch' } latest
|
||||
- if pipeline.triggered?
|
||||
%span.label.label-primary triggered
|
||||
- if pipeline.yaml_errors.present?
|
||||
|
@ -61,7 +61,7 @@
|
|||
.btn-group.inline
|
||||
- if actions.any?
|
||||
.btn-group
|
||||
%button.dropdown-toggle.btn.btn-default.has-tooltip.js-pipeline-dropdown-manual-actions{ type: 'button', title: 'Manual job', data: { toggle: 'dropdown', placement: 'top' }, 'aria-label' => 'Manual job' }
|
||||
%button.dropdown-toggle.btn.btn-default.has-tooltip.js-pipeline-dropdown-manual-actions{ type: 'button', title: 'Manual pipeline', data: { toggle: 'dropdown', placement: 'top' }, 'aria-label' => 'Manual pipeline' }
|
||||
= custom_icon('icon_play')
|
||||
= icon('caret-down', 'aria-hidden' => 'true')
|
||||
%ul.dropdown-menu.dropdown-menu-align-right
|
||||
|
|
|
@ -17,11 +17,11 @@
|
|||
ci_status: "#{@merge_request.head_pipeline ? @merge_request.head_pipeline.status : ''}",
|
||||
ci_message: {
|
||||
normal: "Pipeline {{status}} for \"{{title}}\"",
|
||||
preparing: "{{status}} job for \"{{title}}\""
|
||||
preparing: "{{status}} pipeline for \"{{title}}\""
|
||||
},
|
||||
ci_enable: #{@project.ci_service ? "true" : "false"},
|
||||
ci_title: {
|
||||
preparing: "{{status}} job",
|
||||
preparing: "{{status}} pipeline",
|
||||
normal: "Pipeline {{status}}"
|
||||
},
|
||||
ci_sha: "#{@merge_request.head_pipeline ? @merge_request.head_pipeline.short_sha : ''}",
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
%h4
|
||||
= icon('exclamation-triangle')
|
||||
The job for this merge request failed
|
||||
The pipeline for this merge request failed
|
||||
|
||||
%p
|
||||
Please retry the job or push a new commit to fix the failure.
|
||||
|
|
|
@ -65,7 +65,7 @@
|
|||
In the
|
||||
%code .gitlab-ci.yml
|
||||
of another project, include the following snippet.
|
||||
The project will be rebuilt at the end of the job.
|
||||
The project will be rebuilt at the end of the pipeline.
|
||||
|
||||
%pre
|
||||
:plain
|
||||
|
@ -89,7 +89,7 @@
|
|||
%p.light
|
||||
Add
|
||||
%code variables[VARIABLE]=VALUE
|
||||
to an API request. Variable values can be used to distinguish between triggered jobs and normal jobs.
|
||||
to an API request. Variable values can be used to distinguish between triggered pipelines and normal pipelines.
|
||||
|
||||
With cURL:
|
||||
|
||||
|
|
4
changelogs/unreleased/fix-job-to-pipeline-renaming.yml
Normal file
4
changelogs/unreleased/fix-job-to-pipeline-renaming.yml
Normal file
|
@ -0,0 +1,4 @@
|
|||
---
|
||||
title: Fix job to pipeline renaming
|
||||
merge_request: 9147
|
||||
author:
|
Loading…
Reference in a new issue