Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
c7a77dce
Commit
c7a77dce
authored
Aug 17, 2017
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove the `pretty` parameter for `usage_data`
parent
86cbf60c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
3 deletions
+2
-3
app/controllers/admin/application_settings_controller.rb
app/controllers/admin/application_settings_controller.rb
+1
-2
app/views/admin/cohorts/_usage_ping.html.haml
app/views/admin/cohorts/_usage_ping.html.haml
+1
-1
No files found.
app/controllers/admin/application_settings_controller.rb
View file @
c7a77dce
...
@@ -20,8 +20,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
...
@@ -20,8 +20,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
def
usage_data
def
usage_data
respond_to
do
|
format
|
respond_to
do
|
format
|
format
.
html
do
format
.
html
do
usage_data
=
Gitlab
::
UsageData
.
data
usage_data_json
=
JSON
.
pretty_generate
(
Gitlab
::
UsageData
.
data
)
usage_data_json
=
params
[
:pretty
]
?
JSON
.
pretty_generate
(
usage_data
)
:
usage_data
.
to_json
render
html:
Gitlab
::
Highlight
.
highlight
(
'payload.json'
,
usage_data_json
)
render
html:
Gitlab
::
Highlight
.
highlight
(
'payload.json'
,
usage_data_json
)
end
end
...
...
app/views/admin/cohorts/_usage_ping.html.haml
View file @
c7a77dce
...
@@ -7,4 +7,4 @@
...
@@ -7,4 +7,4 @@
=
succeed
'.'
do
=
succeed
'.'
do
=
link_to
'application settings'
,
admin_application_settings_path
(
anchor:
'usage-statistics'
)
=
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
)
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment