diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2018-10-11 18:14:40 +0300 |
|---|---|---|
| committer | Cindy Pallares <cindy@gitlab.com> | 2018-10-12 00:28:43 +0300 |
| commit | 6f3918dfe7181874ad1a693d28c177223234569f (patch) | |
| tree | 187ed859fc0cb8e1763b9e3c537121d817016f1e /app | |
| parent | dd411a204e010f2eea4a5d3e5797533de1b70a73 (diff) | |
Merge branch '52519-runners-link' into 'master'
Stuck block URL links to runners settings
Closes #52519
See merge request gitlab-org/gitlab-ce!22286
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/jobs/components/job_app.vue | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/jobs/job_details_bundle.js | 2 | ||||
| -rw-r--r-- | app/views/projects/jobs/show.html.haml | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/app/assets/javascripts/jobs/components/job_app.vue b/app/assets/javascripts/jobs/components/job_app.vue index 6380f525120..acf91e2e9ed 100644 --- a/app/assets/javascripts/jobs/components/job_app.vue +++ b/app/assets/javascripts/jobs/components/job_app.vue @@ -18,7 +18,7 @@ StuckBlock, }, props: { - runnerHelpUrl: { + runnerSettingsUrl: { type: String, required: false, default: null, @@ -76,7 +76,7 @@ class="js-job-stuck" :has-no-runners-for-project="job.runners.available" :tags="job.tags" - :runners-path="runnerHelpUrl" + :runners-path="runnerSettingsUrl" /> <environments-block diff --git a/app/assets/javascripts/jobs/job_details_bundle.js b/app/assets/javascripts/jobs/job_details_bundle.js index 3eb75e72506..22eef770687 100644 --- a/app/assets/javascripts/jobs/job_details_bundle.js +++ b/app/assets/javascripts/jobs/job_details_bundle.js @@ -33,7 +33,7 @@ export default () => { props: { isLoading: this.isLoading, job: this.job, - runnerHelpUrl: dataset.runnerHelpUrl, + runnerSettingsUrl: dataset.runnerSettingsUrl, }, }); }, diff --git a/app/views/projects/jobs/show.html.haml b/app/views/projects/jobs/show.html.haml index a5f814b722d..02a088d338b 100644 --- a/app/views/projects/jobs/show.html.haml +++ b/app/views/projects/jobs/show.html.haml @@ -47,4 +47,6 @@ .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') } } |