summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/jobs/components/sidebar_detail_row.vue6
-rw-r--r--app/assets/javascripts/jobs/components/sidebar_details_block.vue7
-rw-r--r--app/assets/javascripts/jobs/job_details_bundle.js1
-rw-r--r--app/views/projects/jobs/show.html.haml2
4 files changed, 13 insertions, 3 deletions
diff --git a/app/assets/javascripts/jobs/components/sidebar_detail_row.vue b/app/assets/javascripts/jobs/components/sidebar_detail_row.vue
index a24a0c5e779..dfe87d89a39 100644
--- a/app/assets/javascripts/jobs/components/sidebar_detail_row.vue
+++ b/app/assets/javascripts/jobs/components/sidebar_detail_row.vue
@@ -44,8 +44,12 @@
<a
:href="helpUrl"
target="_blank"
+ rel="noopener noreferrer nofollow"
>
- <i class="fa fa-question-circle"></i>
+ <i
+ class="fa fa-question-circle"
+ aria-hidden="true"
+ ></i>
</a>
</span>
</p>
diff --git a/app/assets/javascripts/jobs/components/sidebar_details_block.vue b/app/assets/javascripts/jobs/components/sidebar_details_block.vue
index c979e11b469..ad859679a1e 100644
--- a/app/assets/javascripts/jobs/components/sidebar_details_block.vue
+++ b/app/assets/javascripts/jobs/components/sidebar_details_block.vue
@@ -22,6 +22,11 @@
type: Boolean,
required: true,
},
+ runnerHelpUrl: {
+ type: String,
+ required: false,
+ default: '',
+ },
},
computed: {
shouldRenderContent() {
@@ -127,7 +132,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"
+ :help-url="runnerHelpUrl"
:value="timeout"
/>
<detail-row
diff --git a/app/assets/javascripts/jobs/job_details_bundle.js b/app/assets/javascripts/jobs/job_details_bundle.js
index 85a88ae409b..656676ead91 100644
--- a/app/assets/javascripts/jobs/job_details_bundle.js
+++ b/app/assets/javascripts/jobs/job_details_bundle.js
@@ -51,6 +51,7 @@ export default () => {
props: {
isLoading: this.mediator.state.isLoading,
job: this.mediator.store.state.job,
+ runnerHelpUrl: dataset.runnerHelpUrl,
},
});
},
diff --git a/app/views/projects/jobs/show.html.haml b/app/views/projects/jobs/show.html.haml
index 849c273db8c..4d2bc3a04a4 100644
--- a/app/views/projects/jobs/show.html.haml
+++ b/app/views/projects/jobs/show.html.haml
@@ -111,4 +111,4 @@
.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' } }