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
Jérome Perrin
gitlab-ce
Commits
f47de1da
Commit
f47de1da
authored
Nov 10, 2016
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
only display link to pipeline in generic build index, not on pipeline show
parent
942de350
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
22 additions
and
20 deletions
+22
-20
app/views/projects/builds/_table.html.haml
app/views/projects/builds/_table.html.haml
+1
-1
app/views/projects/ci/builds/_build.html.haml
app/views/projects/ci/builds/_build.html.haml
+10
-8
app/views/projects/commit/_ci_stage.html.haml
app/views/projects/commit/_ci_stage.html.haml
+2
-2
app/views/projects/commit/_pipeline.html.haml
app/views/projects/commit/_pipeline.html.haml
+0
-1
app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
.../generic_commit_statuses/_generic_commit_status.html.haml
+9
-8
No files found.
app/views/projects/builds/_table.html.haml
View file @
f47de1da
...
@@ -20,6 +20,6 @@
...
@@ -20,6 +20,6 @@
%th
Coverage
%th
Coverage
%th
%th
=
render
partial:
"projects/ci/builds/build"
,
collection:
builds
,
as: :build
,
locals:
{
commit_sha:
true
,
ref:
true
,
stage:
true
,
allow_retry:
true
,
coverage:
admin
||
project
.
build_coverage_enabled?
,
admin:
admin
}
=
render
partial:
"projects/ci/builds/build"
,
collection:
builds
,
as: :build
,
locals:
{
commit_sha:
true
,
ref:
true
,
pipeline_link:
true
,
stage:
true
,
allow_retry:
true
,
coverage:
admin
||
project
.
build_coverage_enabled?
,
admin:
admin
}
=
paginate
builds
,
theme:
'gitlab'
=
paginate
builds
,
theme:
'gitlab'
app/views/projects/ci/builds/_build.html.haml
View file @
f47de1da
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
-
ref
=
local_assigns
.
fetch
(
:ref
,
nil
)
-
ref
=
local_assigns
.
fetch
(
:ref
,
nil
)
-
commit_sha
=
local_assigns
.
fetch
(
:commit_sha
,
nil
)
-
commit_sha
=
local_assigns
.
fetch
(
:commit_sha
,
nil
)
-
retried
=
local_assigns
.
fetch
(
:retried
,
false
)
-
retried
=
local_assigns
.
fetch
(
:retried
,
false
)
-
pipeline_link
=
local_assigns
.
fetch
(
:pipeline_link
,
false
)
-
stage
=
local_assigns
.
fetch
(
:stage
,
false
)
-
stage
=
local_assigns
.
fetch
(
:stage
,
false
)
-
coverage
=
local_assigns
.
fetch
(
:coverage
,
false
)
-
coverage
=
local_assigns
.
fetch
(
:coverage
,
false
)
-
allow_retry
=
local_assigns
.
fetch
(
:allow_retry
,
false
)
-
allow_retry
=
local_assigns
.
fetch
(
:allow_retry
,
false
)
...
@@ -51,6 +52,7 @@
...
@@ -51,6 +52,7 @@
-
if
build
.
manual?
-
if
build
.
manual?
%span
.label.label-info
manual
%span
.label.label-info
manual
-
if
pipeline_link
%td
%td
=
link_to
pipeline_path
(
build
.
pipeline
)
do
=
link_to
pipeline_path
(
build
.
pipeline
)
do
%span
.pipeline-id
##{build.pipeline.id}
%span
.pipeline-id
##{build.pipeline.id}
...
...
app/views/projects/commit/_ci_stage.html.haml
View file @
f47de1da
...
@@ -8,8 +8,8 @@
...
@@ -8,8 +8,8 @@
-
if
stage
-
if
stage
=
stage
.
titleize
=
stage
.
titleize
=
render
statuses
.
latest_ci_stages
,
coverage:
@project
.
build_coverage_enabled?
,
stage:
false
,
ref:
false
,
allow_retry:
true
=
render
statuses
.
latest_ci_stages
,
coverage:
@project
.
build_coverage_enabled?
,
stage:
false
,
ref:
false
,
pipeline_link:
false
,
allow_retry:
true
=
render
statuses
.
retried_ci_stages
,
coverage:
@project
.
build_coverage_enabled?
,
stage:
false
,
ref:
false
,
retried:
true
=
render
statuses
.
retried_ci_stages
,
coverage:
@project
.
build_coverage_enabled?
,
stage:
false
,
ref:
false
,
pipeline_link:
false
,
retried:
true
%tr
%tr
%td
{
colspan:
10
}
%td
{
colspan:
10
}
app/views/projects/commit/_pipeline.html.haml
View file @
f47de1da
...
@@ -61,7 +61,6 @@
...
@@ -61,7 +61,6 @@
%tr
%tr
%th
Status
%th
Status
%th
Build ID
%th
Build ID
%th
Pipeline
%th
Name
%th
Name
%th
%th
-
if
pipeline
.
project
.
build_coverage_enabled?
-
if
pipeline
.
project
.
build_coverage_enabled?
...
...
app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
View file @
f47de1da
...
@@ -15,6 +15,7 @@
...
@@ -15,6 +15,7 @@
-
if
defined?
(
retried
)
&&
retried
-
if
defined?
(
retried
)
&&
retried
=
icon
(
'warning'
,
class:
'text-warning has-tooltip'
,
title:
'Status was retried.'
)
=
icon
(
'warning'
,
class:
'text-warning has-tooltip'
,
title:
'Status was retried.'
)
-
if
defined?
(
pipeline_link
)
&&
pipeline_link
%td
%td
=
link_to
pipeline_path
(
generic_commit_status
.
pipeline
)
do
=
link_to
pipeline_path
(
generic_commit_status
.
pipeline
)
do
%span
.pipeline-id
##{generic_commit_status.pipeline.id}
%span
.pipeline-id
##{generic_commit_status.pipeline.id}
...
...
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