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
3d49246d
Commit
3d49246d
authored
Jun 29, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '33961-blank-section' into 'master'
Move verification to block level instead of paragraph Closes #33961 See merge request !12519
parents
efb7b2d3
19364c2b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
1 deletion
+12
-1
sidebar_details_block.vue
...ets/javascripts/jobs/components/sidebar_details_block.vue
+12
-1
No files found.
app/assets/javascripts/jobs/components/sidebar_details_block.vue
View file @
3d49246d
...
...
@@ -39,6 +39,17 @@
runnerId
()
{
return
`#
${
this
.
job
.
runner
.
id
}
`
;
},
renderBlock
()
{
return
this
.
job
.
merge_request
||
this
.
job
.
duration
||
this
.
job
.
finished_data
||
this
.
job
.
erased_at
||
this
.
job
.
queued
||
this
.
job
.
runner
||
this
.
job
.
coverage
||
this
.
job
.
tags
.
length
||
this
.
job
.
cancel_path
;
},
},
};
</
script
>
...
...
@@ -63,7 +74,7 @@
Retry
</a>
</div>
<div
class=
"block
"
>
<div
:class=
"
{block : renderBlock }
">
<p
class=
"build-detail-row js-job-mr"
v-if=
"job.merge_request"
>
...
...
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