summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Gray <annabel.m.gray@gmail.com>2018-06-08 02:09:54 +0000
committerAnnabel Gray <annabel.m.gray@gmail.com>2018-06-08 02:09:54 +0000
commit21451cbc3dc9f70de393aa72d1ac9a6c8a3fd0c3 (patch)
treefa1de9965d434694df0bb41cd409bb0b8351cb0d
parent9f69be38673c2d0f0e4c07c377195c3b310132bd (diff)
parent5003870542b329869c1da343c34409ba327fc224 (diff)
downloadgitlab-ce-21451cbc3dc9f70de393aa72d1ac9a6c8a3fd0c3.tar.gz
Merge branch 'fix-loading-icon' into 'master'
Fix loading icon in activity view Closes #47508 See merge request gitlab-org/gitlab-ce!19566
-rw-r--r--app/helpers/icons_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/icons_helper.rb b/app/helpers/icons_helper.rb
index 58372edff3c..2f304b040c7 100644
--- a/app/helpers/icons_helper.rb
+++ b/app/helpers/icons_helper.rb
@@ -60,7 +60,7 @@ module IconsHelper
def spinner(text = nil, visible = false)
css_class = 'loading'
- css_class << ' hidden' unless visible
+ css_class << ' hide' unless visible
content_tag :div, class: css_class do
icon('spinner spin') + text