kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Stuck block URL links to runners settings

Browse source
This commit is contained in:
Filipa Lacerda 2018-10-11 15:14:40 +00:00 committed by Tim Zallmann
parent 3ff2e1bb9d
commit e63cbf4ece
5 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/jobs/components/job_app.vue
View file

@ -18,7 +18,7 @@
StuckBlock, StuckBlock,
}, },
props: { props: {
runnerHelpUrl: { runnerSettingsUrl: {
type: String, type: String,
required: false, required: false,
default: null, default: null,
@ -76,7 +76,7 @@
class="js-job-stuck" class="js-job-stuck"
:has-no-runners-for-project="job.runners.available" :has-no-runners-for-project="job.runners.available"
:tags="job.tags" :tags="job.tags"
:runners-path="runnerHelpUrl" :runners-path="runnerSettingsUrl"
/> />
<environments-block <environments-block

2
app/assets/javascripts/jobs/job_details_bundle.js
View file

@ -33,7 +33,7 @@ export default () => {
props: { props: {
isLoading: this.isLoading, isLoading: this.isLoading,
job: this.job, job: this.job,
runnerHelpUrl: dataset.runnerHelpUrl, runnerSettingsUrl: dataset.runnerSettingsUrl,
}, },
}); });
}, },

4
app/views/projects/jobs/show.html.haml
View file

@ -47,4 +47,6 @@
.js-build-options{ data: javascript_build_options } .js-build-options{ data: javascript_build_options }
#js-job-details-vue{ data: { endpoint: project_job_path(@project, @build, format: :json), runner_help_url: help_page_path('ci/runners/README.html', anchor: 'setting-maximum-job-timeout-for-a-runner') } } #js-job-details-vue{ data: { endpoint: project_job_path(@project, @build, format: :json),
runner_help_url: help_page_path('ci/runners/README.html', anchor: 'setting-maximum-job-timeout-for-a-runner'),
runner_settings_url: project_runners_path(@build.project, anchor: 'js-runners-settings') } }

5
changelogs/unreleased/52519-runners-link.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Fixes stuck block URL linking to documentation instead of settings page
merge_request: 22286
author:
type: fixed

2
spec/javascripts/jobs/components/job_app_spec.js
View file

@ -41,7 +41,7 @@ describe('Job App ', () => {
}; };
const props = { const props = {
runnerHelpUrl: 'help/runners', runnerSettingsUrl: 'settings/ci-cd/runners',
}; };
beforeEach(() => { beforeEach(() => {