Automatic merge of gitlab-org/gitlab-ce master

0fef93d1 · GitLab Bot · 614d3fbf · 39799d0a · 0fef93d1 · 0fef93d1
Commit 0fef93d1 authored May 21, 2019 by GitLab Bot
Showing with 7 additions and 2 deletions

app/views/shared/_mini_pipeline_graph.html.haml app/views/shared/_mini_pipeline_graph.html.haml +2 -2

changelogs/unreleased/61990-spinner.yml changelogs/unreleased/61990-spinner.yml +5 -0

No files found.
--- a/app/views/shared/_mini_pipeline_graph.html.haml
+++ b/app/views/shared/_mini_pipeline_graph.html.haml
@@ -13,5 +13,5 @@
            %ul

          %li.js-builds-dropdown-loading.hidden
-            .text-center
-              %i.fa.fa-spinner.fa-spin{ 'aria-hidden': 'true', 'aria-label': 'Loading' }
+            .loading-container.text-center
+              %span.spinner{ 'aria-label': 'Loading' }
--- a/changelogs/unreleased/61990-spinner.yml
+++ b/changelogs/unreleased/61990-spinner.yml
+---
+title: Updates loading icon in commits page
+merge_request: 28475
+author:
+type: fixed