BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
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
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
22 additions
and
20 deletions
+22
-20
_table.html.haml
app/views/projects/builds/_table.html.haml
+1
-1
_build.html.haml
app/views/projects/ci/builds/_build.html.haml
+10
-8
_ci_stage.html.haml
app/views/projects/commit/_ci_stage.html.haml
+2
-2
_pipeline.html.haml
app/views/projects/commit/_pipeline.html.haml
+0
-1
_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 @@
%th
Coverage
%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'
app/views/projects/ci/builds/_build.html.haml
View file @
f47de1da
...
...
@@ -2,6 +2,7 @@
-
ref
=
local_assigns
.
fetch
(
:ref
,
nil
)
-
commit_sha
=
local_assigns
.
fetch
(
:commit_sha
,
nil
)
-
retried
=
local_assigns
.
fetch
(
:retried
,
false
)
-
pipeline_link
=
local_assigns
.
fetch
(
:pipeline_link
,
false
)
-
stage
=
local_assigns
.
fetch
(
:stage
,
false
)
-
coverage
=
local_assigns
.
fetch
(
:coverage
,
false
)
-
allow_retry
=
local_assigns
.
fetch
(
:allow_retry
,
false
)
...
...
@@ -51,14 +52,15 @@
-
if
build
.
manual?
%span
.label.label-info
manual
%td
=
link_to
pipeline_path
(
build
.
pipeline
)
do
%span
.pipeline-id
##{build.pipeline.id}
%span
by
-
if
build
.
pipeline
.
user
=
user_avatar
(
user:
build
.
pipeline
.
user
,
size:
20
)
-
else
%span
.api.monospace
API
-
if
pipeline_link
%td
=
link_to
pipeline_path
(
build
.
pipeline
)
do
%span
.pipeline-id
##{build.pipeline.id}
%span
by
-
if
build
.
pipeline
.
user
=
user_avatar
(
user:
build
.
pipeline
.
user
,
size:
20
)
-
else
%span
.api.monospace
API
-
if
admin
%td
...
...
app/views/projects/commit/_ci_stage.html.haml
View file @
f47de1da
...
...
@@ -8,8 +8,8 @@
-
if
stage
=
stage
.
titleize
=
render
statuses
.
latest_ci_stages
,
coverage:
@project
.
build_coverage_enabled?
,
stage:
false
,
ref:
false
,
allow_retry:
true
=
render
statuses
.
retried_ci_stages
,
coverage:
@project
.
build_coverage_enabled?
,
stage:
false
,
ref:
false
,
retried:
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
,
pipeline_link:
false
,
retried:
true
%tr
%td
{
colspan:
10
}
app/views/projects/commit/_pipeline.html.haml
View file @
f47de1da
...
...
@@ -61,7 +61,6 @@
%tr
%th
Status
%th
Build ID
%th
Pipeline
%th
Name
%th
-
if
pipeline
.
project
.
build_coverage_enabled?
...
...
app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
View file @
f47de1da
...
...
@@ -15,14 +15,15 @@
-
if
defined?
(
retried
)
&&
retried
=
icon
(
'warning'
,
class:
'text-warning has-tooltip'
,
title:
'Status was retried.'
)
%td
=
link_to
pipeline_path
(
generic_commit_status
.
pipeline
)
do
%span
.pipeline-id
##{generic_commit_status.pipeline.id}
%span
by
-
if
generic_commit_status
.
pipeline
.
user
=
user_avatar
(
user:
generic_commit_status
.
pipeline
.
user
,
size:
20
)
-
else
%span
.api.monospace
API
-
if
defined?
(
pipeline_link
)
&&
pipeline_link
%td
=
link_to
pipeline_path
(
generic_commit_status
.
pipeline
)
do
%span
.pipeline-id
##{generic_commit_status.pipeline.id}
%span
by
-
if
generic_commit_status
.
pipeline
.
user
=
user_avatar
(
user:
generic_commit_status
.
pipeline
.
user
,
size:
20
)
-
else
%span
.api.monospace
API
-
if
defined?
(
commit_sha
)
&&
commit_sha
%td
...
...
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