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
Léo-Paul Géneau
gitlab-ce
Commits
e75614e8
Commit
e75614e8
authored
Feb 26, 2018
by
Tomasz Maczukin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add few frontend improvements
parent
f18eb6da
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
3 deletions
+13
-3
app/assets/javascripts/jobs/components/sidebar_detail_row.vue
...assets/javascripts/jobs/components/sidebar_detail_row.vue
+5
-1
app/assets/javascripts/jobs/components/sidebar_details_block.vue
...ets/javascripts/jobs/components/sidebar_details_block.vue
+6
-1
app/assets/javascripts/jobs/job_details_bundle.js
app/assets/javascripts/jobs/job_details_bundle.js
+1
-0
app/views/projects/jobs/show.html.haml
app/views/projects/jobs/show.html.haml
+1
-1
No files found.
app/assets/javascripts/jobs/components/sidebar_detail_row.vue
View file @
e75614e8
...
@@ -44,8 +44,12 @@
...
@@ -44,8 +44,12 @@
<a
<a
:href=
"helpUrl"
:href=
"helpUrl"
target=
"_blank"
target=
"_blank"
rel=
"noopener noreferrer nofollow"
>
>
<i
class=
"fa fa-question-circle"
></i>
<i
class=
"fa fa-question-circle"
aria-hidden=
"true"
></i>
</a>
</a>
</span>
</span>
</p>
</p>
...
...
app/assets/javascripts/jobs/components/sidebar_details_block.vue
View file @
e75614e8
...
@@ -22,6 +22,11 @@
...
@@ -22,6 +22,11 @@
type
:
Boolean
,
type
:
Boolean
,
required
:
true
,
required
:
true
,
},
},
runnerHelpUrl
:
{
type
:
String
,
required
:
false
,
default
:
''
,
},
},
},
computed
:
{
computed
:
{
shouldRenderContent
()
{
shouldRenderContent
()
{
...
@@ -127,7 +132,7 @@
...
@@ -127,7 +132,7 @@
class=
"js-job-timeout"
class=
"js-job-timeout"
v-if=
"job.timeout"
v-if=
"job.timeout"
title=
"Timeout"
title=
"Timeout"
help-url=
"/help/ci/runners/README.html#setting-maximum-job-timeout-for-a-runner
"
:help-url=
"runnerHelpUrl
"
:value=
"timeout"
:value=
"timeout"
/>
/>
<detail-row
<detail-row
...
...
app/assets/javascripts/jobs/job_details_bundle.js
View file @
e75614e8
...
@@ -51,6 +51,7 @@ export default () => {
...
@@ -51,6 +51,7 @@ export default () => {
props
:
{
props
:
{
isLoading
:
this
.
mediator
.
state
.
isLoading
,
isLoading
:
this
.
mediator
.
state
.
isLoading
,
job
:
this
.
mediator
.
store
.
state
.
job
,
job
:
this
.
mediator
.
store
.
state
.
job
,
runnerHelpUrl
:
dataset
.
runnerHelpUrl
,
},
},
});
});
},
},
...
...
app/views/projects/jobs/show.html.haml
View file @
e75614e8
...
@@ -111,4 +111,4 @@
...
@@ -111,4 +111,4 @@
.js-build-options
{
data:
javascript_build_options
}
.js-build-options
{
data:
javascript_build_options
}
#js-job-details-vue
{
data:
{
endpoint:
project_job_path
(
@project
,
@build
,
format: :json
)
}
}
#js-job-details-vue
{
data:
{
endpoint:
project_job_path
(
@project
,
@build
,
format: :json
)
,
runner_help_url:
'/help/ci/runners/README.html#setting-maximum-job-timeout-for-a-runner'
}
}
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