kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '20084-update-the-spinner-component' into 'master'

Browse source 
Fix gl-loading-icon bug before gitlab-ui update

See merge request gitlab-org/gitlab-ce!25683
This commit is contained in:
Fatih Acet 2019-03-08 12:42:24 +00:00
commit 40016ab741
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/assets/javascripts/notes/components/note_actions.vue
View file

@ -158,7 +158,6 @@ export default {
href="#" href="#"
title="Add reaction" title="Add reaction"
> >
<gl-loading-icon inline />
<icon <icon
css-classes="link-highlight award-control-icon-neutral" css-classes="link-highlight award-control-icon-neutral"
name="emoji_slightly_smiling_face" name="emoji_slightly_smiling_face"

4
changelogs/unreleased/20084-update-the-spinner-component.yml
View file

@ -1,5 +1,5 @@
--- ---
title: Add a spinner icon which is rendered using pure css title: Add a spinner icon which is rendered using pure css + update conflicting CSS
merge_request: 25186 merge_request: 25683
author: author:
type: changed type: changed