Commit 2da45e9c authored by gleb's avatar gleb
Browse files

Refs #1013

Renamed protect_resque.rb => resque_authentication
Integrated resque web with the rest of gitlab
parent 677a540638b1
class Admin::ResqueController < ApplicationController
layout 'admin'
def show
end
end
\ No newline at end of file
......@@ -4,7 +4,7 @@
%h5
Resque Workers
.data.padded
= link_to "/info/resque" do
= link_to admin_resque_path do
%h1{:class => @workers.present? ? "cgreen" : "cred"}
= @workers.count
%hr
......
%h3 Resque
%iframe{:src => "/info/resque", :width => 1168, :height => 600, :style => "border: none"}
\ No newline at end of file
......@@ -6,10 +6,10 @@
= render "layouts/head_panel", :title => "Admin area"
.container
%nav.main_menu
= link_to "Stats", admin_root_path, :class => "home #{controller.controller_name == "dashboard" ? "current" : nil}"
= link_to "Projects", admin_projects_path, :class => controller.controller_name == "projects" ? "current" : nil
= link_to "Users", admin_users_path, :class => controller.controller_name == "users" ? "current" : nil
= link_to "Emails", admin_emails_path, :class => controller.controller_name == "mailer" ? "current" : nil
= link_to "Resque", "/info/resque"
= link_to "Stats", admin_root_path, :class => "home #{'current' if controller.controller_name == "dashboard"}"
= link_to "Projects", admin_projects_path, :class => ('current' if controller.controller_name == "projects")
= link_to "Users", admin_users_path, :class => ('current' if controller.controller_name == 'users')
= link_to "Emails", admin_emails_path, :class => ('current' if controller.controller_name == 'mailer')
= link_to "Resque", admin_resque_path, :class => ('current' if controller.controller_name == 'resque')
.content= yield
require 'resque/server'
Resque::Server.use(Rack::Auth::Basic) do |user, password|
user == "gitlab"
password == "5iveL!fe"
end
require 'resque/server'
class Authentication
def initialize(app)
@app = app
end
def call(env)
account = env['warden'].authenticate!(:database_authenticatable, :rememberable, scope: :user)
raise "Access denied" if !account.admin?
@app.call(env)
end
end
Resque::Server.use Authentication
\ No newline at end of file
......@@ -38,6 +38,7 @@
get 'mailer/preview_note'
get 'mailer/preview_user_new'
get 'mailer/preview_issue_new'
resource :resque, :controller => 'resque'
root :to => "dashboard#index"
end
......
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