summaryrefslogtreecommitdiff
path: root/spec/javascripts/fixtures
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-05-04 15:54:16 +0100
committerPhil Hughes <me@iamphill.com>2017-05-04 15:54:16 +0100
commit79f40f27fd64b9209e1faa528e658d831e2c7f2f (patch)
tree5eb1c7837b5180c0071ec75e238c27fe917023ee /spec/javascripts/fixtures
parent5c91113c5b6edc4fa1d63bc161b791c7e84e644d (diff)
parent985737fdcf9b79dadfb72d0c9ed9abf4464559f8 (diff)
downloadgitlab-ce-79f40f27fd64b9209e1faa528e658d831e2c7f2f.tar.gz
Merge branch 'master' into deploy-keys-load-async
Diffstat (limited to 'spec/javascripts/fixtures')
-rw-r--r--spec/javascripts/fixtures/mini_dropdown_graph.html.haml6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/javascripts/fixtures/mini_dropdown_graph.html.haml b/spec/javascripts/fixtures/mini_dropdown_graph.html.haml
index 29370b974af..b532b48a95b 100644
--- a/spec/javascripts/fixtures/mini_dropdown_graph.html.haml
+++ b/spec/javascripts/fixtures/mini_dropdown_graph.html.haml
@@ -3,7 +3,7 @@
Dropdown
%ul.dropdown-menu.mini-pipeline-graph-dropdown-menu.js-builds-dropdown-container
- .js-builds-dropdown-list.scrollable-menu
+ %li.js-builds-dropdown-list.scrollable-menu
- .js-builds-dropdown-loading.builds-dropdown-loading.hidden
- %span.fa.fa-spinner.fa-spin
+ %li.js-builds-dropdown-loading.hidden
+ %span.fa.fa-spinner