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
2ed1d541
Commit
2ed1d541
authored
Mar 01, 2018
by
Tomasz Maczukin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix static analysis offences
parent
1dde609c
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
3 additions
and
7 deletions
+3
-7
app/presenters/ci/build_metadata_presenter.rb
app/presenters/ci/build_metadata_presenter.rb
+1
-3
app/presenters/ci/build_presenter.rb
app/presenters/ci/build_presenter.rb
+0
-1
app/serializers/build_metadata_entity.rb
app/serializers/build_metadata_entity.rb
+0
-1
spec/javascripts/jobs/sidebar_detail_row_spec.js
spec/javascripts/jobs/sidebar_detail_row_spec.js
+0
-1
spec/models/concerns/chronic_duration_attribute_spec.rb
spec/models/concerns/chronic_duration_attribute_spec.rb
+2
-1
No files found.
app/presenters/ci/build_metadata_presenter.rb
View file @
2ed1d541
module
Ci
module
Ci
class
BuildMetadataPresenter
<
Gitlab
::
View
::
Presenter
::
Delegated
class
BuildMetadataPresenter
<
Gitlab
::
View
::
Presenter
::
Delegated
TIMEOUT_SOURCES
=
{
TIMEOUT_SOURCES
=
{
unknown_timeout_source:
nil
,
unknown_timeout_source:
nil
,
project_timeout_source:
'project'
,
project_timeout_source:
'project'
,
...
@@ -13,8 +12,7 @@ module Ci
...
@@ -13,8 +12,7 @@ module Ci
return
unless
metadata
.
timeout_source?
return
unless
metadata
.
timeout_source?
TIMEOUT_SOURCES
[
metadata
.
timeout_source
.
to_sym
]
||
TIMEOUT_SOURCES
[
metadata
.
timeout_source
.
to_sym
]
||
metadata
.
timeout_source
metadata
.
timeout_source
end
end
end
end
end
end
app/presenters/ci/build_presenter.rb
View file @
2ed1d541
module
Ci
module
Ci
class
BuildPresenter
<
Gitlab
::
View
::
Presenter
::
Delegated
class
BuildPresenter
<
Gitlab
::
View
::
Presenter
::
Delegated
presents
:build
presents
:build
def
erased_by_user?
def
erased_by_user?
...
...
app/serializers/build_metadata_entity.rb
View file @
2ed1d541
class
BuildMetadataEntity
<
Grape
::
Entity
class
BuildMetadataEntity
<
Grape
::
Entity
expose
:used_timeout_human_readable
do
|
metadata
|
expose
:used_timeout_human_readable
do
|
metadata
|
metadata
.
used_timeout_human_readable
unless
metadata
.
used_timeout
.
nil?
metadata
.
used_timeout_human_readable
unless
metadata
.
used_timeout
.
nil?
end
end
...
...
spec/javascripts/jobs/sidebar_detail_row_spec.js
View file @
2ed1d541
...
@@ -53,5 +53,4 @@ describe('Sidebar detail row', () => {
...
@@ -53,5 +53,4 @@ describe('Sidebar detail row', () => {
it
(
'
should render help when helpUrl is provided
'
,
()
=>
{
it
(
'
should render help when helpUrl is provided
'
,
()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.help-button a
'
).
getAttribute
(
'
href
'
)).
toEqual
(
'
help url
'
);
expect
(
vm
.
$el
.
querySelector
(
'
.help-button a
'
).
getAttribute
(
'
href
'
)).
toEqual
(
'
help url
'
);
});
});
});
});
spec/models/concerns/chronic_duration_attribute_spec.rb
View file @
2ed1d541
...
@@ -39,7 +39,8 @@ end
...
@@ -39,7 +39,8 @@ end
describe
'ChronicDurationAttribute'
do
describe
'ChronicDurationAttribute'
do
let
(
:source_field
)
{
:maximum_job_timeout
}
let
(
:source_field
)
{
:maximum_job_timeout
}
let
(
:virtual_field
)
{
:maximum_job_timeout_human_readable
}
let
(
:virtual_field
)
{
:maximum_job_timeout_human_readable
}
subject
{
Ci
::
Runner
.
new
}
subject
{
Ci
::
Runner
.
new
}
it_behaves_like
'ChronicDurationAttribute reader'
it_behaves_like
'ChronicDurationAttribute reader'
it_behaves_like
'ChronicDurationAttribute writer'
it_behaves_like
'ChronicDurationAttribute writer'
...
...
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