summaryrefslogtreecommitdiff
path: root/app/helpers/application_settings_helper.rb
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-07-31 18:21:12 +0200
committerRémy Coutable <remy@rymai.me>2018-08-01 08:23:07 +0200
commit7af940e412ee61dbcff75d91488a502e46d0059e (patch)
tree2eaf4a26bee787de1c60970fb699d94e69d21432 /app/helpers/application_settings_helper.rb
parentb690c268c2c34e1a7e34a9bbef264fe986e2f2d4 (diff)
downloadgitlab-ce-7af940e412ee61dbcff75d91488a502e46d0059e.tar.gz
Fix a few disrepencies between CE and EE in the lines ordering
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/helpers/application_settings_helper.rb')
-rw-r--r--app/helpers/application_settings_helper.rb14
1 files changed, 7 insertions, 7 deletions
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb
index f802f61eb12..da54988ccfe 100644
--- a/app/helpers/application_settings_helper.rb
+++ b/app/helpers/application_settings_helper.rb
@@ -238,15 +238,15 @@ module ApplicationSettingsHelper
:signup_enabled,
:terminal_max_session_time,
:terms,
- :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,
+ :throttle_authenticated_api_requests_per_period,
+ :throttle_authenticated_web_enabled,
+ :throttle_authenticated_web_period_in_seconds,
+ :throttle_authenticated_web_requests_per_period,
+ :throttle_unauthenticated_enabled,
+ :throttle_unauthenticated_period_in_seconds,
+ :throttle_unauthenticated_requests_per_period,
:two_factor_grace_period,
:unique_ips_limit_enabled,
:unique_ips_limit_per_user,