diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-11-17 16:11:22 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-11-17 16:11:22 +0000 |
| commit | 371180a47d292957b73c6c9e1e662b6c99a62ee9 (patch) | |
| tree | 3fe546335b7a18fb5741214ec15937465a84b525 /app/helpers | |
| parent | 7142af49fa5947d439c1c539140538fc740f5187 (diff) | |
| parent | 4188c10c07d7b9bfaee5046ecfcc88cf8cca456b (diff) | |
| download | gitlab-ce-371180a47d292957b73c6c9e1e662b6c99a62ee9.tar.gz | |
Merge branch 'mk-add-user-rate-limits' into 'master'
Add request rate limits
Closes #30053
See merge request gitlab-org/gitlab-ce!14708
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/application_settings_helper.rb | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb index cd1ecaadb85..e5d2693b01e 100644 --- a/app/helpers/application_settings_helper.rb +++ b/app/helpers/application_settings_helper.rb @@ -231,6 +231,15 @@ module ApplicationSettingsHelper :sign_in_text, :signup_enabled, :terminal_max_session_time, + :throttle_unauthenticated_enabled, + :throttle_unauthenticated_requests_per_period, + :throttle_unauthenticated_period_in_seconds, + :throttle_authenticated_web_enabled, + :throttle_authenticated_web_requests_per_period, + :throttle_authenticated_web_period_in_seconds, + :throttle_authenticated_api_enabled, + :throttle_authenticated_api_requests_per_period, + :throttle_authenticated_api_period_in_seconds, :two_factor_grace_period, :unique_ips_limit_enabled, :unique_ips_limit_per_user, |