Skip to content
Snippets Groups Projects
Commit 2343dd8d authored by Tim Zallmann's avatar Tim Zallmann
Browse files

Merge branch '52519-runners-link' into 'master'

Stuck block URL links to runners settings

Closes #52519

See merge request gitlab-org/gitlab-ce!22286
parents 3ff2e1bb e63cbf4e
No related branches found
No related tags found
1 merge request!10495Merge Requests - Assignee
Loading
Loading
@@ -18,7 +18,7 @@
StuckBlock,
},
props: {
runnerHelpUrl: {
runnerSettingsUrl: {
type: String,
required: false,
default: null,
Loading
Loading
@@ -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
Loading
Loading
Loading
Loading
@@ -33,7 +33,7 @@ export default () => {
props: {
isLoading: this.isLoading,
job: this.job,
runnerHelpUrl: dataset.runnerHelpUrl,
runnerSettingsUrl: dataset.runnerSettingsUrl,
},
});
},
Loading
Loading
Loading
Loading
@@ -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') } }
---
title: Fixes stuck block URL linking to documentation instead of settings page
merge_request: 22286
author:
type: fixed
Loading
Loading
@@ -41,7 +41,7 @@ describe('Job App ', () => {
};
 
const props = {
runnerHelpUrl: 'help/runners',
runnerSettingsUrl: 'settings/ci-cd/runners',
};
 
beforeEach(() => {
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment