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
Boxiang Sun
gitlab-ce
Commits
2115c360
Commit
2115c360
authored
Oct 14, 2016
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove unnecessary retried check & fix test failures
parent
0bd52500
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
+4
-3
app/helpers/builds_helper.rb
app/helpers/builds_helper.rb
+1
-0
app/views/projects/ci/builds/_build.html.haml
app/views/projects/ci/builds/_build.html.haml
+2
-2
spec/features/projects/pipelines_spec.rb
spec/features/projects/pipelines_spec.rb
+1
-1
No files found.
app/helpers/builds_helper.rb
View file @
2115c360
...
@@ -3,5 +3,6 @@ module BuildsHelper
...
@@ -3,5 +3,6 @@ module BuildsHelper
build_class
=
''
build_class
=
''
build_class
+=
' active'
if
build
==
current_build
build_class
+=
' active'
if
build
==
current_build
build_class
+=
' retried'
if
build
.
retried?
build_class
+=
' retried'
if
build
.
retried?
build_class
end
end
end
end
app/views/projects/ci/builds/_build.html.haml
View file @
2115c360
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
-
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
)
%tr
.build.commit
{
class:
(
'retried'
if
defined?
(
retried
)
&&
retried
)}
%tr
.build.commit
{
class:
(
'retried'
if
retried
)}
%td
.status
%td
.status
-
if
can?
(
current_user
,
:read_build
,
build
)
-
if
can?
(
current_user
,
:read_build
,
build
)
=
ci_status_with_icon
(
build
.
status
,
namespace_project_build_url
(
build
.
project
.
namespace
,
build
.
project
,
build
))
=
ci_status_with_icon
(
build
.
status
,
namespace_project_build_url
(
build
.
project
.
namespace
,
build
.
project
,
build
))
...
@@ -36,7 +36,7 @@
...
@@ -36,7 +36,7 @@
-
if
build
.
stuck?
-
if
build
.
stuck?
=
icon
(
'warning'
,
class:
'text-warning has-tooltip'
,
title:
'Build is stuck. Check runners.'
)
=
icon
(
'warning'
,
class:
'text-warning has-tooltip'
,
title:
'Build is stuck. Check runners.'
)
-
if
defined?
(
retried
)
&&
retried
-
if
retried
=
icon
(
'refresh'
,
class:
'text-warning has-tooltip'
,
title:
'Build was retried'
)
=
icon
(
'refresh'
,
class:
'text-warning has-tooltip'
,
title:
'Build was retried'
)
.label-container
.label-container
...
...
spec/features/projects/pipelines_spec.rb
View file @
2115c360
...
@@ -177,7 +177,7 @@ describe "Pipelines" do
...
@@ -177,7 +177,7 @@ describe "Pipelines" do
before
{
click_on
'Retry failed'
}
before
{
click_on
'Retry failed'
}
it
{
expect
(
page
).
not_to
have_content
(
'Retry failed'
)
}
it
{
expect
(
page
).
not_to
have_content
(
'Retry failed'
)
}
it
{
expect
(
page
).
to
have_
content
(
'
retried'
)
}
it
{
expect
(
page
).
to
have_
selector
(
'.
retried'
)
}
end
end
end
end
...
...
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