diff options
| author | Sean McGivern <sean@gitlab.com> | 2017-04-05 13:29:48 +0100 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-04-14 15:20:55 +0200 |
| commit | 0483019e9800dc1b4ef4493890f815f047b7c04e (patch) | |
| tree | 24430c787a2e69166ccd214cc1e15a489f32e9e9 /app/controllers/admin/application_settings_controller.rb | |
| parent | ebd5e9b4549ebc80155a5a8f139efdb40b6f8b12 (diff) | |
| download | gitlab-ce-0483019e9800dc1b4ef4493890f815f047b7c04e.tar.gz | |
Port 'Add more usage data to EE ping' to CE
CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/735
Diffstat (limited to 'app/controllers/admin/application_settings_controller.rb')
| -rw-r--r-- | app/controllers/admin/application_settings_controller.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb index 82b01be5a11..73b03b41594 100644 --- a/app/controllers/admin/application_settings_controller.rb +++ b/app/controllers/admin/application_settings_controller.rb @@ -17,6 +17,13 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController end end + def usage_data + respond_to do |format| + format.html { render html: Gitlab::Highlight.highlight('payload.json', Gitlab::UsageData.to_json) } + format.json { render json: Gitlab::UsageData.to_json } + end + end + def reset_runners_token @application_setting.reset_runners_registration_token! flash[:notice] = 'New runners registration token has been generated!' |