Commit 70dad152 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch '10891-usage-ping-for-incident-management-ce' into 'master'

Whitelist query limiting admin usage data endpoint

See merge request gitlab-org/gitlab-ce!29488
parents 97d2701f 792a998b
...@@ -2,7 +2,9 @@ ...@@ -2,7 +2,9 @@
class Admin::ApplicationSettingsController < Admin::ApplicationController class Admin::ApplicationSettingsController < Admin::ApplicationController
include InternalRedirect include InternalRedirect
before_action :set_application_setting before_action :set_application_setting
before_action :whitelist_query_limiting, only: [:usage_data]
def show def show
end end
...@@ -102,6 +104,10 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController ...@@ -102,6 +104,10 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
@application_setting = Gitlab::CurrentSettings.current_application_settings @application_setting = Gitlab::CurrentSettings.current_application_settings
end end
def whitelist_query_limiting
Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/63107')
end
def application_setting_params def application_setting_params
params[:application_setting] ||= {} params[:application_setting] ||= {}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment