kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix job to pipeline renaming

Browse source
This commit is contained in:
Filipa Lacerda 2017-02-10 18:13:15 +00:00
parent 01c2a50fa2
commit fd2e3da05a
5 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/views/projects/ci/pipelines/_pipeline.html.haml
View file

@ -15,7 +15,7 @@
- else - else
%span.api.monospace API %span.api.monospace API
- if pipeline.latest? - 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? - if pipeline.triggered?
%span.label.label-primary triggered %span.label.label-primary triggered
- if pipeline.yaml_errors.present? - if pipeline.yaml_errors.present?
@ -61,7 +61,7 @@
.btn-group.inline .btn-group.inline
- if actions.any? - if actions.any?
.btn-group .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') = custom_icon('icon_play')
= icon('caret-down', 'aria-hidden' => 'true') = icon('caret-down', 'aria-hidden' => 'true')
%ul.dropdown-menu.dropdown-menu-align-right %ul.dropdown-menu.dropdown-menu-align-right

4
app/views/projects/merge_requests/widget/_show.html.haml
View file

@ -17,11 +17,11 @@
ci_status: "#{@merge_request.head_pipeline ? @merge_request.head_pipeline.status : ''}", ci_status: "#{@merge_request.head_pipeline ? @merge_request.head_pipeline.status : ''}",
ci_message: { ci_message: {
normal: "Pipeline {{status}} for \"{{title}}\"", normal: "Pipeline {{status}} for \"{{title}}\"",
preparing: "{{status}} job for \"{{title}}\"" preparing: "{{status}} pipeline for \"{{title}}\""
}, },
ci_enable: #{@project.ci_service ? "true" : "false"}, ci_enable: #{@project.ci_service ? "true" : "false"},
ci_title: { ci_title: {
preparing: "{{status}} job", preparing: "{{status}} pipeline",
normal: "Pipeline {{status}}" normal: "Pipeline {{status}}"
}, },
ci_sha: "#{@merge_request.head_pipeline ? @merge_request.head_pipeline.short_sha : ''}", ci_sha: "#{@merge_request.head_pipeline ? @merge_request.head_pipeline.short_sha : ''}",

2
app/views/projects/merge_requests/widget/open/_build_failed.html.haml
View file

@ -1,6 +1,6 @@
%h4 %h4
= icon('exclamation-triangle') = icon('exclamation-triangle')
The job for this merge request failed The pipeline for this merge request failed
%p %p
Please retry the job or push a new commit to fix the failure. Please retry the job or push a new commit to fix the failure.

4
app/views/projects/triggers/_index.html.haml
View file

@ -65,7 +65,7 @@
In the In the
%code .gitlab-ci.yml %code .gitlab-ci.yml
of another project, include the following snippet. 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 %pre
:plain :plain
@ -89,7 +89,7 @@
%p.light %p.light
Add Add
%code variables[VARIABLE]=VALUE %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: With cURL:

4
changelogs/unreleased/fix-job-to-pipeline-renaming.yml Normal file
View file

@ -0,0 +1,4 @@
---
title: Fix job to pipeline renaming
merge_request: 9147
author: