summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2017-08-17 17:50:29 -0400
committerRobert Speicher <rspeicher@gmail.com>2017-09-06 14:25:09 -0400
commitc7a77dced766a42306c6a667a574e4cbbb1598ac (patch)
treed2738e86b7bc1e6d9a613dfe938560ab87bc2943 /app/controllers
parent86cbf60cbb77d15ac01d86cec2e387974426f898 (diff)
downloadgitlab-ce-c7a77dced766a42306c6a667a574e4cbbb1598ac.tar.gz
Remove the `pretty` parameter for `usage_data`rs-remove-usage-ping-pretty
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/admin/application_settings_controller.rb3
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