From 6745e58f8f809a6813ac42fcd2ac82729234df1e Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>
Date: Wed, 13 Apr 2016 18:25:39 -0400
Subject: [PATCH] Fix issue with labels not showing initially.

---
 app/assets/javascripts/lib/animate.js.coffee | 2 ++
 app/views/shared/issuable/_filter.html.haml  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/lib/animate.js.coffee b/app/assets/javascripts/lib/animate.js.coffee
index 64aef4c6d43..ec3b44d6126 100644
--- a/app/assets/javascripts/lib/animate.js.coffee
+++ b/app/assets/javascripts/lib/animate.js.coffee
@@ -19,6 +19,8 @@
 
   gl.animate.animateEach = ($els, animation, time, options, done) ->
     dfd = $.Deferred()
+    if not $els.length
+      dfd.resolve()
     $els.each((i) ->
       setTimeout(=>
         $this = $(@)
diff --git a/app/views/shared/issuable/_filter.html.haml b/app/views/shared/issuable/_filter.html.haml
index 02982516de9..623ca5ab98f 100644
--- a/app/views/shared/issuable/_filter.html.haml
+++ b/app/views/shared/issuable/_filter.html.haml
@@ -46,9 +46,9 @@
           .filter-item.inline
             = button_tag "Update issues", class: "btn update_selected_issues btn-save"
 
-- if @labels
   .gray-content-block.second-block.filtered-labels
-    = render "shared/label_row", labels: @labels
+    - if @labels
+      = render "shared/label_row", labels: @labels
 
 :javascript
   new UsersSelect();