summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/jobs
diff options
context:
space:
mode:
authorClement Ho <ClemMakesApps@gmail.com>2018-04-25 10:51:53 -0500
committerClement Ho <ClemMakesApps@gmail.com>2018-04-25 10:51:53 -0500
commit56982fcf24ba4290dcca6b8c4e852d716b179748 (patch)
treeeb4c8883d41b21212468a6f8f07990b61d7181d8 /app/assets/javascripts/jobs
parent80766821b24cc13a6ce054f5b0c996bebccc4121 (diff)
parentc5f6c811eec6bca7952f84af9e30f3fafb848352 (diff)
downloadgitlab-ce-56982fcf24ba4290dcca6b8c4e852d716b179748.tar.gz
Merge branch 'master' into bootstrap4
Diffstat (limited to 'app/assets/javascripts/jobs')
-rw-r--r--app/assets/javascripts/jobs/components/sidebar_details_block.vue2
1 files changed, 1 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 f238a334d41..50a35b96c59 100644
--- a/app/assets/javascripts/jobs/components/sidebar_details_block.vue
+++ b/app/assets/javascripts/jobs/components/sidebar_details_block.vue
@@ -45,7 +45,7 @@ export default {
return timeIntervalInWords(this.job.queued);
},
runnerId() {
- return `#${this.job.runner.id}`;
+ return `${this.job.runner.description} (#${this.job.runner.id})`;
},
retryButtonClass() {
let className = 'js-retry-button pull-right btn btn-retry d-none d-md-block d-lg-block d-xl-block';