Gitlab_meta to 3.1. Added workaround for 500 Redis error until it will be fixed

1 files changed, 16 insertions, 8 deletions

diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml
index 3e26f566a2e..b0b59a46fdb 100644
--- a/app/views/admin/dashboard/index.html.haml
+++ b/app/views/admin/dashboard/index.html.haml
@@ -4,13 +4,21 @@
       %h5
         Resque Workers
       .data.padded
-        = link_to admin_resque_path do
-          %h1{class: @workers.present? ? "cgreen" : "cred"}
-            = @workers.count
-        %hr
-        %p
-          %strong{class: @pending_jobs > 0 ? "cred" : "cgreen"}
-            #{@pending_jobs} post receive jobs waiting
+        - if @resque_accessible
+          = link_to admin_resque_path do
+            %h1{class: @workers.present? ? "cgreen" : "cred"}
+              = @workers.count
+          %hr
+          %p
+            %strong{class: @pending_jobs > 0 ? "cred" : "cgreen"}
+              #{@pending_jobs} post receive jobs waiting
+        - else
+          = link_to admin_resque_path do
+            %h1.cdark ?
+          %hr
+          %p
+            %strong Resque status unknown
+
 
   .span4
     .ui-box
@@ -42,6 +50,6 @@
     %hr
     - @users.each do |user|
       %p
-        = link_to [:admin, user] do 
+        = link_to [:admin, user] do
           = user.name
           %small= user.email