Merge branch 'improve-mr-enhance-style-of-the-shared-runners-limit' into 'master'
Refactor passing props to jobs/index.js See merge request gitlab-org/gitlab-ce!31472
This commit is contained in:
commit
f10208a341
2 changed files with 22 additions and 9 deletions
|
@ -10,17 +10,29 @@ export default () => {
|
||||||
JobApp,
|
JobApp,
|
||||||
},
|
},
|
||||||
render(createElement) {
|
render(createElement) {
|
||||||
|
const {
|
||||||
|
deploymentHelpUrl,
|
||||||
|
runnerHelpUrl,
|
||||||
|
runnerSettingsUrl,
|
||||||
|
variablesSettingsUrl,
|
||||||
|
endpoint,
|
||||||
|
pagePath,
|
||||||
|
logState,
|
||||||
|
buildStatus,
|
||||||
|
projectPath,
|
||||||
|
} = element.dataset;
|
||||||
|
|
||||||
return createElement('job-app', {
|
return createElement('job-app', {
|
||||||
props: {
|
props: {
|
||||||
deploymentHelpUrl: element.dataset.deploymentHelpUrl,
|
deploymentHelpUrl,
|
||||||
runnerHelpUrl: element.dataset.runnerHelpUrl,
|
runnerHelpUrl,
|
||||||
runnerSettingsUrl: element.dataset.runnerSettingsUrl,
|
runnerSettingsUrl,
|
||||||
variablesSettingsUrl: element.dataset.variablesSettingsUrl,
|
variablesSettingsUrl,
|
||||||
endpoint: element.dataset.endpoint,
|
endpoint,
|
||||||
pagePath: element.dataset.buildOptionsPagePath,
|
pagePath,
|
||||||
logState: element.dataset.buildOptionsLogState,
|
logState,
|
||||||
buildStatus: element.dataset.buildOptionsBuildStatus,
|
buildStatus,
|
||||||
projectPath: element.dataset.projectPath,
|
projectPath,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
|
@ -12,4 +12,5 @@
|
||||||
runner_help_url: help_page_path('ci/runners/README.html', anchor: 'setting-maximum-job-timeout-for-a-runner'),
|
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'),
|
runner_settings_url: project_runners_path(@build.project, anchor: 'js-runners-settings'),
|
||||||
variables_settings_url: project_variables_path(@build.project, anchor: 'js-cicd-variables-settings'),
|
variables_settings_url: project_variables_path(@build.project, anchor: 'js-cicd-variables-settings'),
|
||||||
|
page_path: project_job_path(@project, @build), build_status: @build.status, build_stage: @build.stage, log_state: '',
|
||||||
build_options: javascript_build_options } }
|
build_options: javascript_build_options } }
|
||||||
|
|
Loading…
Reference in a new issue