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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
df84444b
Commit
df84444b
authored
Dec 07, 2016
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix specs
parent
6bb32939
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
14 deletions
+14
-14
app/views/projects/ci/builds/_build.html.haml
app/views/projects/ci/builds/_build.html.haml
+4
-4
app/views/projects/commit/_pipeline.html.haml
app/views/projects/commit/_pipeline.html.haml
+1
-1
app/views/projects/pipelines/_with_tabs.html.haml
app/views/projects/pipelines/_with_tabs.html.haml
+2
-2
app/views/projects/stage/_stage.html.haml
app/views/projects/stage/_stage.html.haml
+7
-7
No files found.
app/views/projects/ci/builds/_build.html.haml
View file @
df84444b
...
@@ -104,9 +104,9 @@
...
@@ -104,9 +104,9 @@
=
link_to
cancel_namespace_project_build_path
(
build
.
project
.
namespace
,
build
.
project
,
build
,
return_to:
request
.
original_url
),
method: :post
,
title:
'Cancel'
,
class:
'btn btn-build'
do
=
link_to
cancel_namespace_project_build_path
(
build
.
project
.
namespace
,
build
.
project
,
build
,
return_to:
request
.
original_url
),
method: :post
,
title:
'Cancel'
,
class:
'btn btn-build'
do
=
icon
(
'remove'
,
class:
'cred'
)
=
icon
(
'remove'
,
class:
'cred'
)
-
elsif
allow_retry
-
elsif
allow_retry
-
if
build
.
retryable?
-
if
build
.
playable?
&&
!
admin
=
link_to
retry_namespace_project_build_path
(
build
.
project
.
namespace
,
build
.
project
,
build
,
return_to:
request
.
original_url
),
method: :post
,
title:
'Retry'
,
class:
'btn btn-build'
do
=
icon
(
'repeat'
)
-
elsif
build
.
playable?
&&
!
admin
=
link_to
play_namespace_project_build_path
(
build
.
project
.
namespace
,
build
.
project
,
build
,
return_to:
request
.
original_url
),
method: :post
,
title:
'Play'
,
class:
'btn btn-build'
do
=
link_to
play_namespace_project_build_path
(
build
.
project
.
namespace
,
build
.
project
,
build
,
return_to:
request
.
original_url
),
method: :post
,
title:
'Play'
,
class:
'btn btn-build'
do
=
custom_icon
(
'icon_play'
)
=
custom_icon
(
'icon_play'
)
-
elsif
build
.
retryable?
=
link_to
retry_namespace_project_build_path
(
build
.
project
.
namespace
,
build
.
project
,
build
,
return_to:
request
.
original_url
),
method: :post
,
title:
'Retry'
,
class:
'btn btn-build'
do
=
icon
(
'repeat'
)
app/views/projects/commit/_pipeline.html.haml
View file @
df84444b
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
=
time_interval_in_words
pipeline
.
duration
=
time_interval_in_words
pipeline
.
duration
.row-content-block.build-content.middle-block.hidden
.row-content-block.build-content.middle-block.hidden
=
render
"projects/pipelines/graph"
,
subject:
pipeline
,
as: :
pipeline
=
render
"projects/pipelines/graph"
,
pipeline:
pipeline
-
if
pipeline
.
yaml_errors
.
present?
-
if
pipeline
.
yaml_errors
.
present?
.bs-callout.bs-callout-danger
.bs-callout.bs-callout-danger
...
...
app/views/projects/pipelines/_with_tabs.html.haml
View file @
df84444b
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
.tab-content
.tab-content
#js-tab-pipeline
.tab-pane
#js-tab-pipeline
.tab-pane
.build-content.middle-block
.build-content.middle-block
=
render
"projects/pipelines/graph"
,
subject:
pipeline
,
as: :
pipeline
=
render
"projects/pipelines/graph"
,
pipeline:
pipeline
#js-tab-builds
.tab-pane
#js-tab-builds
.tab-pane
-
if
pipeline
.
yaml_errors
.
present?
-
if
pipeline
.
yaml_errors
.
present?
...
...
app/views/projects/stage/_stage.html.haml
View file @
df84444b
%tr
%tr
%th
{
colspan:
10
}
%th
{
colspan:
10
}
%strong
%strong
%a
{
name:
s
ubject
.
name
}
%a
{
name:
s
tage
.
name
}
%span
{
class:
"ci-status-link ci-status-icon-#{s
ubject
.status}"
}
%span
{
class:
"ci-status-link ci-status-icon-#{s
tage
.status}"
}
=
ci_icon_for_status
(
s
ubject
.
status
)
=
ci_icon_for_status
(
s
tage
.
status
)
-
if
s
ubject
.
name
-
if
s
tage
.
name
=
s
ubject
.
name
.
titleize
=
s
tage
.
name
.
titleize
=
render
subject
.
statuses
.
latest_ordered
,
coverage:
@project
.
build_coverage_enabled?
,
stage:
false
,
ref:
false
,
pipeline_link:
false
,
allow_retry:
true
=
render
stage
.
statuses
.
latest_ordered
,
coverage:
@project
.
build_coverage_enabled?
,
stage:
false
,
ref:
false
,
pipeline_link:
false
,
allow_retry:
true
=
render
subject
.
statuses
.
retried_ordered
,
coverage:
@project
.
build_coverage_enabled?
,
stage:
false
,
ref:
false
,
pipeline_link:
false
,
retried:
true
=
render
stage
.
statuses
.
retried_ordered
,
coverage:
@project
.
build_coverage_enabled?
,
stage:
false
,
ref:
false
,
pipeline_link:
false
,
retried:
true
%tr
%tr
%td
{
colspan:
10
}
%td
{
colspan:
10
}
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