diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2019-03-08 12:42:24 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2019-03-08 12:42:24 +0000 |
| commit | 40016ab741cd4c9fb873b2dcdc009393aa496b71 (patch) | |
| tree | f2cf1759da0416e1271b750b17393d6201ae8be4 | |
| parent | c8116ebda8cfb1176d56ff371062e7564e969022 (diff) | |
| parent | d81a5fcecfc7cba977c8648b853d84eadabdf074 (diff) | |
| download | gitlab-ce-40016ab741cd4c9fb873b2dcdc009393aa496b71.tar.gz | |
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
| -rw-r--r-- | app/assets/javascripts/notes/components/note_actions.vue | 1 | ||||
| -rw-r--r-- | changelogs/unreleased/20084-update-the-spinner-component.yml | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/app/assets/javascripts/notes/components/note_actions.vue b/app/assets/javascripts/notes/components/note_actions.vue index de1ea0f58d6..fc73726857d 100644 --- a/app/assets/javascripts/notes/components/note_actions.vue +++ b/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" diff --git a/changelogs/unreleased/20084-update-the-spinner-component.yml b/changelogs/unreleased/20084-update-the-spinner-component.yml index c93648e4f54..46d79767753 100644 --- a/changelogs/unreleased/20084-update-the-spinner-component.yml +++ b/changelogs/unreleased/20084-update-the-spinner-component.yml @@ -1,5 +1,5 @@ --- -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 |