diff options
| author | Peter Leitzen <pleitzen@gitlab.com> | 2019-06-11 17:08:44 +0200 |
|---|---|---|
| committer | Peter Leitzen <pleitzen@gitlab.com> | 2019-06-11 17:20:34 +0200 |
| commit | 84ecf3314c6a99d1b224c65fc966ed206bc5ccb9 (patch) | |
| tree | dbac88e38dbcb9092bd728865519f22a83986365 | |
| parent | f813e9016daa33c82d261a8729c957d670fee0f3 (diff) | |
| download | gitlab-ce-10891-usage-ping-for-incident-management-ce.tar.gz | |
Whitelist query limiting admin usage data endpoint10891-usage-ping-for-incident-management-ce
| -rw-r--r-- | app/controllers/admin/application_settings_controller.rb | 6 |
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] ||= {} |