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
30157572
Commit
30157572
authored
Sep 14, 2020
by
Gilang Gumilar
Committed by
Miguel Rincon
Sep 14, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Migrate '.fa-spinner' to '.spinner' for 'app/.../gpg_badges.js'
parent
e36f62ad
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
2 deletions
+8
-2
app/assets/javascripts/gpg_badges.js
app/assets/javascripts/gpg_badges.js
+2
-1
changelogs/unreleased/202273-migrate-spinner-for-app-assets-javascripts-gpg_badges-js.yml
...rate-spinner-for-app-assets-javascripts-gpg_badges-js.yml
+5
-0
spec/frontend/gpg_badges_spec.js
spec/frontend/gpg_badges_spec.js
+1
-1
No files found.
app/assets/javascripts/gpg_badges.js
View file @
30157572
...
@@ -13,7 +13,8 @@ export default class GpgBadges {
...
@@ -13,7 +13,8 @@ export default class GpgBadges {
const
badges
=
$
(
'
.js-loading-gpg-badge
'
);
const
badges
=
$
(
'
.js-loading-gpg-badge
'
);
badges
.
html
(
'
<i class="fa fa-spinner fa-spin"></i>
'
);
badges
.
html
(
'
<span class="gl-spinner gl-spinner-orange gl-spinner-sm"></span>
'
);
badges
.
children
().
attr
(
'
aria-label
'
,
__
(
'
Loading
'
));
const
displayError
=
()
=>
createFlash
(
__
(
'
An error occurred while loading commit signatures
'
));
const
displayError
=
()
=>
createFlash
(
__
(
'
An error occurred while loading commit signatures
'
));
...
...
changelogs/unreleased/202273-migrate-spinner-for-app-assets-javascripts-gpg_badges-js.yml
0 → 100644
View file @
30157572
---
title
:
Migrate '.fa-spinner' to '.spinner' for 'app/assets/javascripts/gpg_badges.js'
merge_request
:
41136
author
:
Gilang Gumilar
type
:
changed
spec/frontend/gpg_badges_spec.js
View file @
30157572
...
@@ -68,7 +68,7 @@ describe('GpgBadges', () => {
...
@@ -68,7 +68,7 @@ describe('GpgBadges', () => {
GpgBadges
.
fetch
()
GpgBadges
.
fetch
()
.
then
(()
=>
{
.
then
(()
=>
{
expect
(
document
.
querySelector
(
'
.js-loading-gpg-badge:empty
'
)).
toBe
(
null
);
expect
(
document
.
querySelector
(
'
.js-loading-gpg-badge:empty
'
)).
toBe
(
null
);
const
spinners
=
document
.
querySelectorAll
(
'
.js-loading-gpg-badge
i.fa.fa-spinner.fa-spin
'
);
const
spinners
=
document
.
querySelectorAll
(
'
.js-loading-gpg-badge
span.gl-spinner
'
);
expect
(
spinners
.
length
).
toBe
(
1
);
expect
(
spinners
.
length
).
toBe
(
1
);
done
();
done
();
...
...
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