diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-06-12 15:59:17 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-06-12 15:59:17 +0000 |
| commit | 70dad1521174b7d9e7f665ee11611368f8d71d31 (patch) | |
| tree | 1a453bb62b8198a168cb0a78ccb0fed90fb90acd | |
| parent | 97d2701ffa7e1fafbfbf85c247a9b79c57fc5607 (diff) | |
| parent | 792a998bd4ea36687ddbbbdc0b991fae64476647 (diff) | |
| download | gitlab-ce-70dad1521174b7d9e7f665ee11611368f8d71d31.tar.gz | |
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
| -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] ||= {} |