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

Gemfile

@@ -152,5 +152,5 @@ group :test do
 end
 
 group :production do
-  gem "gitlab_meta", '3.0'
+  gem "gitlab_meta", '3.1'
 end

Gemfile.lock

@@ -171,7 +171,7 @@ GEM
       mime-types (~> 1.19)
       pygments.rb (>= 0.2.13)
     github-markup (0.7.4)
-    gitlab_meta (3.0)
+    gitlab_meta (3.1)
     gitolite (1.1.0)
       gratr19 (~> 0.4.4.1)
       grit (~> 2.5.0)
@@ -465,7 +465,7 @@ DEPENDENCIES
   git
   github-linguist (~> 2.3.4)
   github-markup (~> 0.7.4)
-  gitlab_meta (= 3.0)
+  gitlab_meta (= 3.1)
   gitolite (= 1.1.0)
   grack!
   grape (~> 0.2.1)

app/controllers/admin/dashboard_controller.rb

@@ -1,8 +1,13 @@
 class Admin::DashboardController < AdminController
   def index
-    @workers = Resque.workers
-    @pending_jobs = Resque.size(:post_receive)
     @projects = Project.order("created_at DESC").limit(10)
     @users = User.order("created_at DESC").limit(10)
+
+    @resque_accessible = true
+    @workers = Resque.workers
+    @pending_jobs = Resque.size(:post_receive)
+
+  rescue Redis::InheritedError
+    @resque_accessible = false
   end
 end

app/views/admin/dashboard/index.html.haml

@@ -4,13 +4,21 @@
       %h5
         Resque Workers
       .data.padded
-        = link_to admin_resque_path do
+        - if @resque_accessible
-          %h1{class: @workers.present? ? "cgreen" : "cred"}
+          = link_to admin_resque_path do
-            = @workers.count
+            %h1{class: @workers.present? ? "cgreen" : "cred"}
-        %hr
+              = @workers.count
-        %p
+          %hr
-          %strong{class: @pending_jobs > 0 ? "cred" : "cgreen"}
+          %p
-            #{@pending_jobs} post receive jobs waiting
+            %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