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

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

See merge request gitlab-org/gitlab-ce!25683

app/assets/javascripts/notes/components/note_actions.vue

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

changelogs/unreleased/20084-update-the-spinner-component.yml

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