diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2017-09-07 15:20:04 +0200 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2017-09-07 15:20:04 +0200 |
| commit | 62a5cc7134457d21bf3a68bfdb04e090cf0e6ecf (patch) | |
| tree | b69d47581d803acd0b456cbf1576a9072624c1f2 /app/controllers | |
| parent | 492eaece7ec80090fd7276758798a2af49fe9763 (diff) | |
| parent | 0c2dc7273819b29efcb77a347af0116aeb5a9927 (diff) | |
| download | gitlab-ce-62a5cc7134457d21bf3a68bfdb04e090cf0e6ecf.tar.gz | |
Merge branch 'master' into zj-auto-devops-tablezj/gitlab-ce-zj-auto-devops-table
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/admin/application_settings_controller.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb index 8367c22d1ca..4dfb397e82c 100644 --- a/app/controllers/admin/application_settings_controller.rb +++ b/app/controllers/admin/application_settings_controller.rb @@ -20,8 +20,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController def usage_data respond_to do |format| format.html do - usage_data = Gitlab::UsageData.data - usage_data_json = params[:pretty] ? JSON.pretty_generate(usage_data) : usage_data.to_json + usage_data_json = JSON.pretty_generate(Gitlab::UsageData.data) render html: Gitlab::Highlight.highlight('payload.json', usage_data_json) end |