Skip to content
Snippets Groups Projects
Commit 898d09a2 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

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

parent d18e2bd5
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -152,5 +152,5 @@ group :test do
end
 
group :production do
gem "gitlab_meta", '3.0'
gem "gitlab_meta", '3.1'
end
Loading
Loading
@@ -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)
Loading
Loading
@@ -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)
Loading
Loading
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
Loading
Loading
@@ -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
Loading
Loading
@@ -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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment