Commit a52936f3 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Renames resque resource to background_jobs

parent 84e4cfc6
class Admin::BackgroundJobsController < Admin::ApplicationController
def show
end
end
...@@ -2,8 +2,5 @@ class Admin::DashboardController < Admin::ApplicationController ...@@ -2,8 +2,5 @@ class Admin::DashboardController < Admin::ApplicationController
def index def index
@projects = Project.order("created_at DESC").limit(10) @projects = Project.order("created_at DESC").limit(10)
@users = User.order("created_at DESC").limit(10) @users = User.order("created_at DESC").limit(10)
rescue Redis::InheritedError
@resque_accessible = false
end end
end end
class Admin::ResqueController < Admin::ApplicationController
def show
end
end
...@@ -7,14 +7,6 @@ ...@@ -7,14 +7,6 @@
%h1= Project.count %h1= Project.count
%hr %hr
= link_to 'New Project', new_project_path, class: "btn btn-small" = link_to 'New Project', new_project_path, class: "btn btn-small"
.span4
.ui-box
%h5.title Groups
.data.padded
= link_to admin_groups_path do
%h1= Group.count
%hr
= link_to 'New Group', new_admin_group_path, class: "btn btn-small"
.span4 .span4
.ui-box .ui-box
%h5.title Users %h5.title Users
...@@ -23,6 +15,14 @@ ...@@ -23,6 +15,14 @@
%h1= User.count %h1= User.count
%hr %hr
= link_to 'New User', new_admin_user_path, class: "btn btn-small" = link_to 'New User', new_admin_user_path, class: "btn btn-small"
.span4
.ui-box
%h5.title Groups
.data.padded
= link_to admin_groups_path do
%h1= Group.count
%hr
= link_to 'New Group', new_admin_group_path, class: "btn btn-small"
.row .row
.span4 .span4
......
...@@ -14,6 +14,6 @@ ...@@ -14,6 +14,6 @@
= link_to "Logs", admin_logs_path = link_to "Logs", admin_logs_path
= nav_link(controller: :hooks) do = nav_link(controller: :hooks) do
= link_to "Hooks", admin_hooks_path = link_to "Hooks", admin_hooks_path
= nav_link(controller: :resque) do = nav_link(controller: :background_jobs) do
= link_to "Background Jobs", admin_resque_path = link_to "Background Jobs", admin_background_jobs_path
...@@ -83,7 +83,7 @@ Gitlab::Application.routes.draw do ...@@ -83,7 +83,7 @@ Gitlab::Application.routes.draw do
end end
resource :logs, only: [:show] resource :logs, only: [:show]
resource :resque, controller: 'resque', only: [:show] resource :background_jobs, controller: 'background_jobs', only: [:show]
resources :projects, constraints: { id: /[a-zA-Z.\/0-9_\-]+/ }, only: [:index, :show] do resources :projects, constraints: { id: /[a-zA-Z.\/0-9_\-]+/ }, only: [:index, :show] do
scope module: :projects, constraints: { id: /[a-zA-Z.\/0-9_\-]+/ } do scope module: :projects, constraints: { id: /[a-zA-Z.\/0-9_\-]+/ } do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment