summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2019-05-21 07:55:45 +0000
committerPhil Hughes <me@iamphill.com>2019-05-21 07:55:45 +0000
commit39799d0a375e4f8f10f9a09c59df09cc03830f41 (patch)
tree6f3d49a514becd391c847ba5e024f6cd40af6508
parent77ebc2aecf29fb5d1cf65063fe8aa3930e3bf68d (diff)
parentd4a028bee556154930098d2aaf963b4e18b9d422 (diff)
downloadgitlab-ce-39799d0a375e4f8f10f9a09c59df09cc03830f41.tar.gz
Merge branch '61990-spinner' into 'master'
Updates loading icon in commit's page Closes #61990 See merge request gitlab-org/gitlab-ce!28475
-rw-r--r--app/views/shared/_mini_pipeline_graph.html.haml4
-rw-r--r--changelogs/unreleased/61990-spinner.yml5
2 files changed, 7 insertions, 2 deletions
diff --git a/app/views/shared/_mini_pipeline_graph.html.haml b/app/views/shared/_mini_pipeline_graph.html.haml
index b46479d9f1a..a1f21c2a83e 100644
--- 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' }
diff --git a/changelogs/unreleased/61990-spinner.yml b/changelogs/unreleased/61990-spinner.yml
new file mode 100644
index 00000000000..27d35e56cc9
--- /dev/null
+++ b/changelogs/unreleased/61990-spinner.yml
@@ -0,0 +1,5 @@
+---
+title: Updates loading icon in commits page
+merge_request: 28475
+author:
+type: fixed