summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorPeter Leitzen <pleitzen@gitlab.com>2019-06-12 15:59:16 +0000
committerRémy Coutable <remy@rymai.me>2019-06-12 15:59:16 +0000
commit792a998bd4ea36687ddbbbdc0b991fae64476647 (patch)
tree1a453bb62b8198a168cb0a78ccb0fed90fb90acd /app
parent97d2701ffa7e1fafbfbf85c247a9b79c57fc5607 (diff)
downloadgitlab-ce-792a998bd4ea36687ddbbbdc0b991fae64476647.tar.gz
Whitelist query limiting admin usage data endpoint
Diffstat (limited to 'app')
-rw-r--r--app/controllers/admin/application_settings_controller.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb
index d5bc723aa8c..57b976b9121 100644
--- a/app/controllers/admin/application_settings_controller.rb
+++ b/app/controllers/admin/application_settings_controller.rb
@@ -2,7 +2,9 @@
class Admin::ApplicationSettingsController < Admin::ApplicationController
include InternalRedirect
+
before_action :set_application_setting
+ before_action :whitelist_query_limiting, only: [:usage_data]
def show
end
@@ -102,6 +104,10 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
@application_setting = Gitlab::CurrentSettings.current_application_settings
end
+ def whitelist_query_limiting
+ Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/63107')
+ end
+
def application_setting_params
params[:application_setting] ||= {}