diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-09-07 13:11:24 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-09-07 13:11:24 +0300 |
| commit | d441b5e7b52ccfadf9adb3b7fc73f5e33f5da6bf (patch) | |
| tree | a2f3c33ed3e55bbfcd486f87bc27690365b830c4 | |
| parent | 8f7638798dc91373c4b58d697e11f01f99a4ca6d (diff) | |
| parent | c7a77dced766a42306c6a667a574e4cbbb1598ac (diff) | |
Merge branch 'rs-remove-usage-ping-pretty' into 'master'
Remove the `pretty` parameter for `usage_data`
Closes #36595
See merge request !14091
| -rw-r--r-- | app/controllers/admin/application_settings_controller.rb | 3 | ||||
| -rw-r--r-- | app/views/admin/cohorts/_usage_ping.html.haml | 2 |
2 files changed, 2 insertions, 3 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 diff --git a/app/views/admin/cohorts/_usage_ping.html.haml b/app/views/admin/cohorts/_usage_ping.html.haml index 73aa95d84f1..3dda386fcf7 100644 --- a/app/views/admin/cohorts/_usage_ping.html.haml +++ b/app/views/admin/cohorts/_usage_ping.html.haml @@ -7,4 +7,4 @@ = succeed '.' do = link_to 'application settings', admin_application_settings_path(anchor: 'usage-statistics') -%pre.usage-data.js-syntax-highlight.code.highlight{ data: { endpoint: usage_data_admin_application_settings_path(format: :html, pretty: true) } } +%pre.usage-data.js-syntax-highlight.code.highlight{ data: { endpoint: usage_data_admin_application_settings_path(format: :html) } } |