summaryrefslogtreecommitdiff
path: root/app/controllers/admin/application_settings_controller.rb
diff options
context:
space:
mode:
authorAdam Niedzielski <adamsunday@gmail.com>2017-04-03 15:17:04 +0200
committerAdam Niedzielski <adamsunday@gmail.com>2017-04-03 15:17:04 +0200
commit9543025e88d3d0fe298e95330b8d38802da50cc6 (patch)
treee96e1a10a4ba6cba5cade8cd959b3894b8e67cd8 /app/controllers/admin/application_settings_controller.rb
parent2faf955c241ce7e99111f8fd0cae2e7ab6167e5a (diff)
downloadgitlab-ce-9543025e88d3d0fe298e95330b8d38802da50cc6.tar.gz
Introduce "polling_interval_multiplier" as application setting
Implement module for setting "Poll-Interval" response header. Return 429 in ETag caching middleware when polling is disabled.
Diffstat (limited to 'app/controllers/admin/application_settings_controller.rb')
-rw-r--r--app/controllers/admin/application_settings_controller.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb
index 0bfbe47eb4f..515d8e1523b 100644
--- a/app/controllers/admin/application_settings_controller.rb
+++ b/app/controllers/admin/application_settings_controller.rb
@@ -134,6 +134,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
:unique_ips_limit_enabled,
:version_check_enabled,
:terminal_max_session_time,
+ :polling_interval_multiplier,
disabled_oauth_sign_in_sources: [],
import_sources: [],