diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-27 00:08:45 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-27 00:08:45 +0000 |
| commit | d9c4e920ed70224d4e3a47b2a1c866a4f6f37ce4 (patch) | |
| tree | 95fa3467e085c3737b29f217faaf6188c14a27f5 /app | |
| parent | 9f6c0ac9fd6921bc0b5190ed4d4eaf0ab1e1f2d7 (diff) | |
| download | gitlab-ce-d9c4e920ed70224d4e3a47b2a1c866a4f6f37ce4.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/application_settings_helper.rb | 6 | ||||
| -rw-r--r-- | app/models/application_setting.rb | 16 | ||||
| -rw-r--r-- | app/models/application_setting_implementation.rb | 6 |
3 files changed, 28 insertions, 0 deletions
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb index 2447a731167..8e1fe1e1595 100644 --- a/app/helpers/application_settings_helper.rb +++ b/app/helpers/application_settings_helper.rb @@ -315,12 +315,18 @@ module ApplicationSettingsHelper :throttle_authenticated_packages_api_enabled, :throttle_authenticated_packages_api_period_in_seconds, :throttle_authenticated_packages_api_requests_per_period, + :throttle_authenticated_files_api_enabled, + :throttle_authenticated_files_api_period_in_seconds, + :throttle_authenticated_files_api_requests_per_period, :throttle_unauthenticated_enabled, :throttle_unauthenticated_period_in_seconds, :throttle_unauthenticated_requests_per_period, :throttle_unauthenticated_packages_api_enabled, :throttle_unauthenticated_packages_api_period_in_seconds, :throttle_unauthenticated_packages_api_requests_per_period, + :throttle_unauthenticated_files_api_enabled, + :throttle_unauthenticated_files_api_period_in_seconds, + :throttle_unauthenticated_files_api_requests_per_period, :throttle_protected_paths_enabled, :throttle_protected_paths_period_in_seconds, :throttle_protected_paths_requests_per_period, diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index 8ed408d2c23..0402beb6283 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -479,6 +479,14 @@ class ApplicationSetting < ApplicationRecord presence: true, numericality: { only_integer: true, greater_than: 0 } + validates :throttle_unauthenticated_files_api_requests_per_period, + presence: true, + numericality: { only_integer: true, greater_than: 0 } + + validates :throttle_unauthenticated_files_api_period_in_seconds, + presence: true, + numericality: { only_integer: true, greater_than: 0 } + validates :throttle_authenticated_api_requests_per_period, presence: true, numericality: { only_integer: true, greater_than: 0 } @@ -503,6 +511,14 @@ class ApplicationSetting < ApplicationRecord presence: true, numericality: { only_integer: true, greater_than: 0 } + validates :throttle_authenticated_files_api_requests_per_period, + presence: true, + numericality: { only_integer: true, greater_than: 0 } + + validates :throttle_authenticated_files_api_period_in_seconds, + presence: true, + numericality: { only_integer: true, greater_than: 0 } + validates :throttle_protected_paths_requests_per_period, presence: true, numericality: { only_integer: true, greater_than: 0 } diff --git a/app/models/application_setting_implementation.rb b/app/models/application_setting_implementation.rb index 060c831a11b..5dfe9f922fd 100644 --- a/app/models/application_setting_implementation.rb +++ b/app/models/application_setting_implementation.rb @@ -167,6 +167,9 @@ module ApplicationSettingImplementation throttle_authenticated_packages_api_enabled: false, throttle_authenticated_packages_api_period_in_seconds: 15, throttle_authenticated_packages_api_requests_per_period: 1000, + throttle_authenticated_files_api_enabled: false, + throttle_authenticated_files_api_period_in_seconds: 15, + throttle_authenticated_files_api_requests_per_period: 500, throttle_incident_management_notification_enabled: false, throttle_incident_management_notification_per_period: 3600, throttle_incident_management_notification_period_in_seconds: 3600, @@ -179,6 +182,9 @@ module ApplicationSettingImplementation throttle_unauthenticated_packages_api_enabled: false, throttle_unauthenticated_packages_api_period_in_seconds: 15, throttle_unauthenticated_packages_api_requests_per_period: 800, + throttle_unauthenticated_files_api_enabled: false, + throttle_unauthenticated_files_api_period_in_seconds: 15, + throttle_unauthenticated_files_api_requests_per_period: 125, time_tracking_limit_to_hours: false, two_factor_grace_period: 48, unique_ips_limit_enabled: false, |