diff options
| author | Felipe Artur <felipefac@gmail.com> | 2019-06-17 15:22:44 -0300 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2019-06-17 15:22:44 -0300 |
| commit | d9df2f730b4eaab4e2d1b5f5045e34bb14e3486f (patch) | |
| tree | 050490a4e90601ad4d175ba6674b98f35937587e /app/controllers/admin | |
| parent | 66b9ca952aa4104f99c1275566e8b5c7d28fce01 (diff) | |
| parent | d2929d6edb3a04054a5218cb1b21cb0759ec1ec8 (diff) | |
| download | gitlab-ce-issue_60515.tar.gz | |
Merge branch 'master' into issue_60515issue_60515
Diffstat (limited to 'app/controllers/admin')
| -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] ||= {} |