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
36753b78
Unverified
Commit
36753b78
authored
Feb 26, 2018
by
Tomasz Maczukin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace user_readable with human_readable
parent
4ce376c0
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
11 additions
and
11 deletions
+11
-11
build.rb
app/models/ci/build.rb
+1
-1
runner.rb
app/models/ci/runner.rb
+2
-2
build_details_entity.rb
app/serializers/build_details_entity.rb
+1
-1
_runner.html.haml
app/views/admin/runners/_runner.html.haml
+1
-1
_form.html.haml
app/views/projects/runners/_form.html.haml
+2
-2
_runner.html.haml
app/views/projects/runners/_runner.html.haml
+1
-1
show.html.haml
app/views/projects/runners/show.html.haml
+1
-1
chronic_duration_attribute_spec.rb
spec/models/concerns/chronic_duration_attribute_spec.rb
+2
-2
No files found.
app/models/ci/build.rb
View file @
36753b78
...
...
@@ -91,7 +91,7 @@ module Ci
after_commit
:update_project_statistics_after_save
,
on:
[
:create
,
:update
]
after_commit
:update_project_statistics
,
on: :destroy
chronic_duration_attr_reader
:used_timeout_
user
_readable
,
:used_timeout
chronic_duration_attr_reader
:used_timeout_
human
_readable
,
:used_timeout
class
<<
self
# This is needed for url_for to work,
...
...
app/models/ci/runner.rb
View file @
36753b78
...
...
@@ -9,7 +9,7 @@ module Ci
ONLINE_CONTACT_TIMEOUT
=
1
.
hour
UPDATE_DB_RUNNER_INFO_EVERY
=
40
.
minutes
AVAILABLE_SCOPES
=
%w[specific shared active paused online]
.
freeze
FORM_EDITABLE
=
%i[description tag_list active run_untagged locked access_level maximum_job_timeout_
user
_readable]
.
freeze
FORM_EDITABLE
=
%i[description tag_list active run_untagged locked access_level maximum_job_timeout_
human
_readable]
.
freeze
has_many
:builds
has_many
:runner_projects
,
dependent: :destroy
# rubocop:disable Cop/ActiveRecordDependent
...
...
@@ -52,7 +52,7 @@ module Ci
cached_attr_reader
:version
,
:revision
,
:platform
,
:architecture
,
:contacted_at
,
:ip_address
chronic_duration_attr
:maximum_job_timeout_
user
_readable
,
:maximum_job_timeout
chronic_duration_attr
:maximum_job_timeout_
human
_readable
,
:maximum_job_timeout
# Searches for runners matching the given query.
#
...
...
app/serializers/build_details_entity.rb
View file @
36753b78
...
...
@@ -6,7 +6,7 @@ class BuildDetailsEntity < JobEntity
expose
:pipeline
,
using:
PipelineEntity
expose
:timeout
,
if:
->
(
*
)
{
!
build
.
used_timeout
.
nil?
}
do
|
build
|
{
value:
build
.
used_timeout_
user
_readable
,
{
value:
build
.
used_timeout_
human
_readable
,
source:
build
.
timeout_source
}
end
...
...
app/views/admin/runners/_runner.html.haml
View file @
36753b78
...
...
@@ -20,7 +20,7 @@
=
runner
.
ip_address
%td
-
if
runner
.
defines_maximum_job_timeout?
=
runner
.
maximum_job_timeout_
user
_readable
=
runner
.
maximum_job_timeout_
human
_readable
-
else
n/a
%td
...
...
app/views/projects/runners/_form.html.haml
View file @
36753b78
...
...
@@ -40,10 +40,10 @@
.col-sm-10
=
f
.
text_field
:description
,
class:
'form-control'
.form-group
=
label_tag
:maximum_job_timeout_
user
_readable
,
class:
'control-label'
do
=
label_tag
:maximum_job_timeout_
human
_readable
,
class:
'control-label'
do
Maximum job timeout
.col-sm-10
=
f
.
text_field
:maximum_job_timeout_
user
_readable
,
class:
'form-control'
=
f
.
text_field
:maximum_job_timeout_
human
_readable
,
class:
'form-control'
.help-block
This timeout will take precedence when lower than Project-defined timeout
.form-group
=
label_tag
:tag_list
,
class:
'control-label'
do
...
...
app/views/projects/runners/_runner.html.haml
View file @
36753b78
...
...
@@ -37,7 +37,7 @@
%p
.runner-description
=
runner
.
description
-
if
runner
.
defines_maximum_job_timeout?
%p
Maximum job timeout:
#{
runner
.
maximum_job_timeout_
user
_readable
}
%p
Maximum job timeout:
#{
runner
.
maximum_job_timeout_
human
_readable
}
-
if
runner
.
tag_list
.
present?
%p
-
runner
.
tag_list
.
sort
.
each
do
|
tag
|
...
...
app/views/projects/runners/show.html.haml
View file @
36753b78
...
...
@@ -57,7 +57,7 @@
%td
=
@runner
.
description
%tr
%td
Maximum job timeout
%td
=
@runner
.
maximum_job_timeout_
user
_readable
%td
=
@runner
.
maximum_job_timeout_
human
_readable
%tr
%td
Last contact
%td
...
...
spec/models/concerns/chronic_duration_attribute_spec.rb
View file @
36753b78
...
...
@@ -26,7 +26,7 @@ end
describe
'ChronicDurationAttribute'
do
let
(
:source_field
)
{
:maximum_job_timeout
}
let
(
:virtual_field
)
{
:maximum_job_timeout_
user
_readable
}
let
(
:virtual_field
)
{
:maximum_job_timeout_
human
_readable
}
subject
{
Ci
::
Runner
.
new
}
it_behaves_like
'ChronicDurationAttribute reader'
...
...
@@ -35,7 +35,7 @@ end
describe
'ChronicDurationAttribute - reader'
do
let
(
:source_field
)
{
:used_timeout
}
let
(
:virtual_field
)
{
:used_timeout_
user
_readable
}
let
(
:virtual_field
)
{
:used_timeout_
human
_readable
}
subject
{
Ci
::
Build
.
new
}
it
"doesn't contain dynamically created writer method"
do
...
...
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