diff options
| author | Tomasz Maczukin <tomasz@maczukin.pl> | 2018-02-21 05:28:31 +0100 |
|---|---|---|
| committer | Tomasz Maczukin <tomasz@maczukin.pl> | 2018-03-28 13:56:55 +0200 |
| commit | c21e817a9081e01bdbf27f4a28bdb7af791a7e8a (patch) | |
| tree | 79aef2966548e483b043dd560cd18cde23ebf7cb /app/assets | |
| parent | 42d2551dda0caf22c642fd8a85948fe77d5483d5 (diff) | |
| download | gitlab-ce-c21e817a9081e01bdbf27f4a28bdb7af791a7e8a.tar.gz | |
Add link to timeout overriding documentation from job page sidebar
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/jobs/components/sidebar_detail_row.vue | 20 | ||||
| -rw-r--r-- | app/assets/javascripts/jobs/components/sidebar_details_block.vue | 1 |
2 files changed, 21 insertions, 0 deletions
diff --git a/app/assets/javascripts/jobs/components/sidebar_detail_row.vue b/app/assets/javascripts/jobs/components/sidebar_detail_row.vue index a6819aaeb12..a24a0c5e779 100644 --- a/app/assets/javascripts/jobs/components/sidebar_detail_row.vue +++ b/app/assets/javascripts/jobs/components/sidebar_detail_row.vue @@ -11,11 +11,19 @@ type: String, required: true, }, + helpUrl: { + type: String, + required: false, + default: '', + }, }, computed: { hasTitle() { return this.title.length > 0; }, + hasHelpURL() { + return this.helpUrl.length > 0; + }, }, }; </script> @@ -28,5 +36,17 @@ {{ title }}: </span> {{ value }} + + <span + v-if="hasHelpURL" + class="help-button pull-right" + > + <a + :href="helpUrl" + target="_blank" + > + <i class="fa fa-question-circle"></i> + </a> + </span> </p> </template> diff --git a/app/assets/javascripts/jobs/components/sidebar_details_block.vue b/app/assets/javascripts/jobs/components/sidebar_details_block.vue index 94c2084623b..c979e11b469 100644 --- a/app/assets/javascripts/jobs/components/sidebar_details_block.vue +++ b/app/assets/javascripts/jobs/components/sidebar_details_block.vue @@ -127,6 +127,7 @@ class="js-job-timeout" v-if="job.timeout" title="Timeout" + help-url="/help/ci/runners/README.html#setting-maximum-job-timeout-for-a-runner" :value="timeout" /> <detail-row |