Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
fd2e3da0
Commit
fd2e3da0
authored
Feb 10, 2017
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix job to pipeline renaming
parent
01c2a50f
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
7 deletions
+11
-7
app/views/projects/ci/pipelines/_pipeline.html.haml
app/views/projects/ci/pipelines/_pipeline.html.haml
+2
-2
app/views/projects/merge_requests/widget/_show.html.haml
app/views/projects/merge_requests/widget/_show.html.haml
+2
-2
app/views/projects/merge_requests/widget/open/_build_failed.html.haml
...ojects/merge_requests/widget/open/_build_failed.html.haml
+1
-1
app/views/projects/triggers/_index.html.haml
app/views/projects/triggers/_index.html.haml
+2
-2
changelogs/unreleased/fix-job-to-pipeline-renaming.yml
changelogs/unreleased/fix-job-to-pipeline-renaming.yml
+4
-0
No files found.
app/views/projects/ci/pipelines/_pipeline.html.haml
View file @
fd2e3da0
...
@@ -15,7 +15,7 @@
...
@@ -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 @@
...
@@ -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
...
...
app/views/projects/merge_requests/widget/_show.html.haml
View file @
fd2e3da0
...
@@ -17,11 +17,11 @@
...
@@ -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
:
''
}
"
,
...
...
app/views/projects/merge_requests/widget/open/_build_failed.html.haml
View file @
fd2e3da0
%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.
app/views/projects/triggers/_index.html.haml
View file @
fd2e3da0
...
@@ -65,7 +65,7 @@
...
@@ -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 @@
...
@@ -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 job
s.
to an API request. Variable values can be used to distinguish between triggered
pipelines and normal pipeline
s.
With cURL:
With cURL:
...
...
changelogs/unreleased/fix-job-to-pipeline-renaming.yml
0 → 100644
View file @
fd2e3da0
---
title
:
Fix job to pipeline renaming
merge_request
:
9147
author
:
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment