diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-19 15:57:54 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-19 15:57:54 +0300 |
commit | 419c53ec62de6e97a517abd5fdd4cbde3a942a34 (patch) | |
tree | 1f43a548b46bca8a5fb8fe0c31cef1883d49c5b6 /app/helpers/application_settings_helper.rb | |
parent | 1da20d9135b3ad9e75e65b028bffc921aaf8deb7 (diff) |
Add latest changes from gitlab-org/gitlab@16-5-stable-eev16.5.0-rc42
Diffstat (limited to 'app/helpers/application_settings_helper.rb')
-rw-r--r-- | app/helpers/application_settings_helper.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb index ef91915ce38..58648a82487 100644 --- a/app/helpers/application_settings_helper.rb +++ b/app/helpers/application_settings_helper.rb @@ -282,6 +282,7 @@ module ApplicationSettingsHelper :external_pipeline_validation_service_timeout, :external_pipeline_validation_service_token, :external_pipeline_validation_service_url, + :failed_login_attempts_unlock_period_in_minutes, :first_day_of_week, :floc_enabled, :force_pages_access_control, @@ -314,12 +315,14 @@ module ApplicationSettingsHelper :jira_connect_application_key, :jira_connect_public_key_storage_enabled, :jira_connect_proxy_url, + :math_rendering_limits_enabled, :max_artifacts_size, :max_attachment_size, + :max_decompressed_archive_size, :max_export_size, :max_import_size, :max_import_remote_file_size, - :max_decompressed_archive_size, + :max_login_attempts, :max_pages_size, :max_pages_custom_domains_per_project, :max_terraform_state_size_bytes, @@ -507,7 +510,8 @@ module ApplicationSettingsHelper :allow_account_deletion, :gitlab_shell_operation_limit, :namespace_aggregation_schedule_lease_duration_in_seconds, - :ci_max_total_yaml_size_bytes + :ci_max_total_yaml_size_bytes, + :project_jobs_api_rate_limit ].tap do |settings| next if Gitlab.com? |