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
e6ba1b2b
Commit
e6ba1b2b
authored
Oct 16, 2020
by
Brandon Labuschagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Migrate fa-spinner to GlLoadingIcon
parent
aba90b6a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
8 deletions
+13
-8
app/assets/javascripts/vue_shared/components/awards_list.vue
app/assets/javascripts/vue_shared/components/awards_list.vue
+3
-5
changelogs/unreleased/202264-migrate-fa-spinner-to-spinner-for-app-assets-javascripts-vue_share.yml
...inner-to-spinner-for-app-assets-javascripts-vue_share.yml
+5
-0
spec/frontend/vue_shared/components/__snapshots__/awards_list_spec.js.snap
..._shared/components/__snapshots__/awards_list_spec.js.snap
+5
-3
No files found.
app/assets/javascripts/vue_shared/components/awards_list.vue
View file @
e6ba1b2b
<
script
>
/* eslint-disable vue/no-v-html */
import
{
groupBy
}
from
'
lodash
'
;
import
{
GlIcon
}
from
'
@gitlab/ui
'
;
import
{
GlIcon
,
GlLoadingIcon
}
from
'
@gitlab/ui
'
;
import
tooltip
from
'
~/vue_shared/directives/tooltip
'
;
import
{
glEmojiTag
}
from
'
../../emoji
'
;
import
{
__
,
sprintf
}
from
'
~/locale
'
;
...
...
@@ -12,6 +12,7 @@ const NO_USER_ID = -1;
export
default
{
components
:
{
GlIcon
,
GlLoadingIcon
,
},
directives
:
{
tooltip
,
...
...
@@ -184,10 +185,7 @@ export default {
<span
class=
"award-control-icon award-control-icon-super-positive"
>
<gl-icon
aria-hidden=
"true"
name=
"smiley"
/>
</span>
<i
aria-hidden=
"true"
class=
"fa fa-spinner fa-spin award-control-icon award-control-icon-loading"
></i>
<gl-loading-icon
size=
"md"
color=
"dark"
class=
"award-control-icon-loading"
/>
</button>
</div>
</div>
...
...
changelogs/unreleased/202264-migrate-fa-spinner-to-spinner-for-app-assets-javascripts-vue_share.yml
0 → 100644
View file @
e6ba1b2b
---
title
:
Migrate '.fa-spinner' to '.spinner' for 'awards_list.vue'
merge_request
:
45393
author
:
type
:
changed
spec/frontend/vue_shared/components/__snapshots__/awards_list_spec.js.snap
View file @
e6ba1b2b
...
...
@@ -228,9 +228,11 @@ exports[`vue_shared/components/awards_list default matches snapshot 1`] = `
/>
</span>
<i
aria-hidden="true"
class="fa fa-spinner fa-spin award-control-icon award-control-icon-loading"
<gl-loading-icon-stub
class="award-control-icon-loading"
color="dark"
label="Loading"
size="md"
/>
</button>
</div>
...
...
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