diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-04-24 12:04:37 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-04-24 12:04:37 +0000 |
| commit | b2041d1ebbe6ccaea393842c64512b16193a36ee (patch) | |
| tree | 93b92a53095096578c19010c33217b98a3ab74d9 | |
| parent | f5524d554bce7028f410f51b5fef85641a5f0216 (diff) | |
| parent | d932533516544021cd1f97654ef52512ae4c2928 (diff) | |
| download | gitlab-ce-b2041d1ebbe6ccaea393842c64512b16193a36ee.tar.gz | |
Merge branch 'show-runners-description-on-jobs-page' into 'master'
Show Runner's description on job's page
See merge request gitlab-org/gitlab-ce!17321
3 files changed, 7 insertions, 2 deletions
diff --git a/app/assets/javascripts/jobs/components/sidebar_details_block.vue b/app/assets/javascripts/jobs/components/sidebar_details_block.vue index 4cd44bf7a76..db19dc9b238 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 visible-md-block visible-lg-block'; diff --git a/changelogs/unreleased/show-runners-description-on-jobs-page.yml b/changelogs/unreleased/show-runners-description-on-jobs-page.yml new file mode 100644 index 00000000000..d9414a3d021 --- /dev/null +++ b/changelogs/unreleased/show-runners-description-on-jobs-page.yml @@ -0,0 +1,5 @@ +--- +title: Show Runner's description on job's page +merge_request: 17321 +author: +type: added diff --git a/spec/javascripts/jobs/sidebar_details_block_spec.js b/spec/javascripts/jobs/sidebar_details_block_spec.js index 6b397c22fb9..9c4454252ce 100644 --- a/spec/javascripts/jobs/sidebar_details_block_spec.js +++ b/spec/javascripts/jobs/sidebar_details_block_spec.js @@ -102,7 +102,7 @@ describe('Sidebar details block', () => { }); it('should render runner ID', () => { - expect(trimWhitespace(vm.$el.querySelector('.js-job-runner'))).toEqual('Runner: #1'); + expect(trimWhitespace(vm.$el.querySelector('.js-job-runner'))).toEqual('Runner: local ci runner (#1)'); }); it('should render timeout information', () => { |