diff options
| author | Phil Hughes <me@iamphill.com> | 2017-06-29 14:24:10 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-06-29 14:24:10 +0000 |
| commit | 3d49246dc8cd28555f7c06608fc75dcd37ee1b08 (patch) | |
| tree | 52d6927fcd2b3b3ad18b11848f6a4183b50c97a1 | |
| parent | efb7b2d341a63e0904c8e49ab79b51cbbb153221 (diff) | |
| parent | 19364c2b78e5fa2c949a4124feae43b15afeb722 (diff) | |
| download | gitlab-ce-3d49246dc8cd28555f7c06608fc75dcd37ee1b08.tar.gz | |
Merge branch '33961-blank-section' into 'master'
Move verification to block level instead of paragraph
Closes #33961
See merge request !12519
| -rw-r--r-- | app/assets/javascripts/jobs/components/sidebar_details_block.vue | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/app/assets/javascripts/jobs/components/sidebar_details_block.vue b/app/assets/javascripts/jobs/components/sidebar_details_block.vue index 4223a8fea49..d0145fed396 100644 --- a/app/assets/javascripts/jobs/components/sidebar_details_block.vue +++ b/app/assets/javascripts/jobs/components/sidebar_details_block.vue @@ -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"> |