diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-22 00:17:52 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-22 00:17:52 +0000 |
| commit | 387586b33e16b04e897f149491daf290bf9fc6f6 (patch) | |
| tree | 622c22d8df0e3db68c021fb72a6eedad18d68962 /app/views | |
| parent | 0a93f691bf210da97fcefe0ddf80b38b0b186a99 (diff) | |
| download | gitlab-ce-387586b33e16b04e897f149491daf290bf9fc6f6.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/admin/application_settings/_ci_cd.html.haml | 3 | ||||
| -rw-r--r-- | app/views/help/instance_configuration/_ci_cd_limits.html.haml | 4 |
2 files changed, 0 insertions, 7 deletions
diff --git a/app/views/admin/application_settings/_ci_cd.html.haml b/app/views/admin/application_settings/_ci_cd.html.haml index fd671f72238..f162f5be746 100644 --- a/app/views/admin/application_settings/_ci_cd.html.haml +++ b/app/views/admin/application_settings/_ci_cd.html.haml @@ -83,9 +83,6 @@ = f.label :ci_active_jobs, plan_limit_setting_description(:ci_active_jobs) = f.number_field :ci_active_jobs, class: 'form-control gl-form-input' .form-group - = f.label :ci_active_pipelines, plan_limit_setting_description(:ci_active_pipelines) - = f.number_field :ci_active_pipelines, class: 'form-control gl-form-input' - .form-group = f.label :ci_project_subscriptions, plan_limit_setting_description(:ci_project_subscriptions) = f.number_field :ci_project_subscriptions, class: 'form-control gl-form-input' .form-group diff --git a/app/views/help/instance_configuration/_ci_cd_limits.html.haml b/app/views/help/instance_configuration/_ci_cd_limits.html.haml index 0a5cbb710e3..8496d354ee1 100644 --- a/app/views/help/instance_configuration/_ci_cd_limits.html.haml +++ b/app/views/help/instance_configuration/_ci_cd_limits.html.haml @@ -27,10 +27,6 @@ - ci_cd_limits.each_value do |limits| %td= instance_configuration_disabled_cell_html(limits[:ci_active_jobs]) %tr - %td= plan_limit_setting_description(:ci_active_pipelines) - - ci_cd_limits.each_value do |limits| - %td= instance_configuration_disabled_cell_html(limits[:ci_active_pipelines]) - %tr %td= plan_limit_setting_description(:ci_project_subscriptions) - ci_cd_limits.each_value do |limits| %td= instance_configuration_disabled_cell_html(limits[:ci_project_subscriptions]) |