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
531b3ad6
Commit
531b3ad6
authored
Feb 12, 2020
by
Justin Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use new spinner in admin/application_settings
parent
34654cc8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
app/assets/javascripts/pages/admin/application_settings/usage_ping_payload.js
...ts/pages/admin/application_settings/usage_ping_payload.js
+3
-3
app/views/admin/application_settings/_usage.html.haml
app/views/admin/application_settings/_usage.html.haml
+1
-1
No files found.
app/assets/javascripts/pages/admin/application_settings/usage_ping_payload.js
View file @
531b3ad6
...
...
@@ -26,18 +26,18 @@ export default class UsagePingPayload {
requestPayload
()
{
if
(
this
.
isInserted
)
return
this
.
showPayload
();
this
.
spinner
.
classList
.
add
(
'
d-inline
'
);
this
.
spinner
.
classList
.
add
(
'
d-inline
-flex
'
);
return
axios
.
get
(
this
.
container
.
dataset
.
endpoint
,
{
responseType
:
'
text
'
,
})
.
then
(({
data
})
=>
{
this
.
spinner
.
classList
.
remove
(
'
d-inline
'
);
this
.
spinner
.
classList
.
remove
(
'
d-inline
-flex
'
);
this
.
insertPayload
(
data
);
})
.
catch
(()
=>
{
this
.
spinner
.
classList
.
remove
(
'
d-inline
'
);
this
.
spinner
.
classList
.
remove
(
'
d-inline
-flex
'
);
flash
(
__
(
'
Error fetching usage ping data.
'
));
});
}
...
...
app/views/admin/application_settings/_usage.html.haml
View file @
531b3ad6
...
...
@@ -26,7 +26,7 @@
%p
.mb-2
=
s_
(
'%{usage_ping_link_start}Learn more%{usage_ping_link_end} about what information is shared with GitLab Inc.'
).
html_safe
%
{
usage_ping_link_start:
usage_ping_link_start
,
usage_ping_link_end:
'</a>'
.
html_safe
}
%button
.btn.js-usage-ping-payload-trigger
{
type:
'button'
}
.
js-spinner.d-none
=
icon
(
'spinner spin'
)
.
spinner.js-spinner.d-none
.js-text.d-inline
=
_
(
'Preview payload'
)
%pre
.usage-data.js-usage-ping-payload.js-syntax-highlight.code.highlight.mt-2.d-none
{
data:
{
endpoint:
usage_data_admin_application_settings_path
(
format: :html
)
}
}
-
else
...
...
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