Commit 42daabf6 authored by Ammar Alakkad's avatar Ammar Alakkad Committed by Kushal Pandya

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
parent 32d89f07
...@@ -73,6 +73,10 @@ export default { ...@@ -73,6 +73,10 @@ export default {
type: String, type: String,
required: true, required: true,
}, },
projectPath: {
type: String,
required: true,
},
logState: { logState: {
type: String, type: String,
required: true, required: true,
...@@ -258,6 +262,7 @@ export default { ...@@ -258,6 +262,7 @@ export default {
:quota-used="job.runners.quota.used" :quota-used="job.runners.quota.used"
:quota-limit="job.runners.quota.limit" :quota-limit="job.runners.quota.limit"
:runners-path="runnerHelpUrl" :runners-path="runnerHelpUrl"
:project-path="projectPath"
/> />
<environments-block <environments-block
......
...@@ -20,6 +20,7 @@ export default () => { ...@@ -20,6 +20,7 @@ export default () => {
pagePath: element.dataset.buildOptionsPagePath, pagePath: element.dataset.buildOptionsPagePath,
logState: element.dataset.buildOptionsLogState, logState: element.dataset.buildOptionsLogState,
buildStatus: element.dataset.buildOptionsBuildStatus, buildStatus: element.dataset.buildOptionsBuildStatus,
projectPath: element.dataset.projectPath,
}, },
}); });
}, },
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
- if current_user && can?(current_user, :download_code, project) - if current_user && can?(current_user, :download_code, project)
= render 'shared/no_ssh' = render 'shared/no_ssh'
= render 'shared/no_password' = render 'shared/no_password'
= render_if_exists 'shared/shared_runners_minutes_limit', project: project
- unless project.empty_repo? - unless project.empty_repo?
= render 'shared/auto_devops_implicitly_enabled_banner', project: project = render 'shared/auto_devops_implicitly_enabled_banner', project: project
= render_if_exists 'projects/above_size_limit_warning', 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 @@ ...@@ -7,7 +7,7 @@
= stylesheet_link_tag 'page_bundles/xterm' = stylesheet_link_tag 'page_bundles/xterm'
%div{ class: container_class } %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'), 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_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'),
......
---
title: Enhance style of the shared runners limit
merge_request: 31386
author:
type: other
...@@ -24,6 +24,7 @@ describe('Job App ', () => { ...@@ -24,6 +24,7 @@ describe('Job App ', () => {
variablesSettingsUrl: 'settings/ci-cd/variables', variablesSettingsUrl: 'settings/ci-cd/variables',
terminalPath: 'jobs/123/terminal', terminalPath: 'jobs/123/terminal',
pagePath: `${gl.TEST_HOST}jobs/123`, pagePath: `${gl.TEST_HOST}jobs/123`,
projectPath: 'user-name/project-name',
logState: logState:
'eyJvZmZzZXQiOjE3NDUxLCJuX29wZW5fdGFncyI6MCwiZmdfY29sb3IiOm51bGwsImJnX2NvbG9yIjpudWxsLCJzdHlsZV9tYXNrIjowfQ%3D%3D', 'eyJvZmZzZXQiOjE3NDUxLCJuX29wZW5fdGFncyI6MCwiZmdfY29sb3IiOm51bGwsImJnX2NvbG9yIjpudWxsLCJzdHlsZV9tYXNrIjowfQ%3D%3D',
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment