Enhance style of the shared runners limit
It also prepare for the EE merge request https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14786
This commit is contained in:
parent
32d89f07f5
commit
42daabf6e4
6 changed files with 14 additions and 2 deletions
|
@ -73,6 +73,10 @@ export default {
|
|||
type: String,
|
||||
required: true,
|
||||
},
|
||||
projectPath: {
|
||||
type: String,
|
||||
required: true,
|
||||
},
|
||||
logState: {
|
||||
type: String,
|
||||
required: true,
|
||||
|
@ -258,6 +262,7 @@ export default {
|
|||
:quota-used="job.runners.quota.used"
|
||||
:quota-limit="job.runners.quota.limit"
|
||||
:runners-path="runnerHelpUrl"
|
||||
:project-path="projectPath"
|
||||
/>
|
||||
|
||||
<environments-block
|
||||
|
|
|
@ -20,6 +20,7 @@ export default () => {
|
|||
pagePath: element.dataset.buildOptionsPagePath,
|
||||
logState: element.dataset.buildOptionsLogState,
|
||||
buildStatus: element.dataset.buildOptionsBuildStatus,
|
||||
projectPath: element.dataset.projectPath,
|
||||
},
|
||||
});
|
||||
},
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
- if current_user && can?(current_user, :download_code, project)
|
||||
= render 'shared/no_ssh'
|
||||
= render 'shared/no_password'
|
||||
= render_if_exists 'shared/shared_runners_minutes_limit', project: project
|
||||
- unless project.empty_repo?
|
||||
= render 'shared/auto_devops_implicitly_enabled_banner', project: project
|
||||
= render_if_exists 'projects/above_size_limit_warning', project: project
|
||||
= render_if_exists 'shared/shared_runners_minutes_limit', project: project, classes: [container_class, ("limit-container-width" unless fluid_layout)]
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
= stylesheet_link_tag 'page_bundles/xterm'
|
||||
|
||||
%div{ class: container_class }
|
||||
#js-job-vue-app{ data: { endpoint: project_job_path(@project, @build, format: :json),
|
||||
#js-job-vue-app{ data: { endpoint: project_job_path(@project, @build, format: :json), project_path: @project.full_path,
|
||||
deployment_help_url: help_page_path('user/project/clusters/index.html', anchor: 'troubleshooting-failed-deployment-jobs'),
|
||||
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'),
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Enhance style of the shared runners limit
|
||||
merge_request: 31386
|
||||
author:
|
||||
type: other
|
|
@ -24,6 +24,7 @@ describe('Job App ', () => {
|
|||
variablesSettingsUrl: 'settings/ci-cd/variables',
|
||||
terminalPath: 'jobs/123/terminal',
|
||||
pagePath: `${gl.TEST_HOST}jobs/123`,
|
||||
projectPath: 'user-name/project-name',
|
||||
logState:
|
||||
'eyJvZmZzZXQiOjE3NDUxLCJuX29wZW5fdGFncyI6MCwiZmdfY29sb3IiOm51bGwsImJnX2NvbG9yIjpudWxsLCJzdHlsZV9tYXNrIjowfQ%3D%3D',
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue