deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1351 from tsigo/nonrelative_resque

Browse source 
Give Resque route a name and use that for the iframe src
This commit is contained in:
Dmitriy Zaporozhets 2012-09-02 11:58:13 -07:00
commit 6997543ac2
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/admin/resque/show.html.haml
View file

@ -1,2 +1,2 @@
%h3 Resque
%iframe{src: "/info/resque", width: 1168, height: 600, style: "border: none"}
%iframe{src: resque_url, width: 1168, height: 600, style: "border: none"}

2
config/routes.rb
View file

@ -10,7 +10,7 @@ Gitlab::Application.routes.draw do
# Optionally, enable Resque here
require 'resque/server'
mount Resque::Server.new, at: '/info/resque'
mount Resque::Server.new, at: '/info/resque', as: 'resque'
# Enable Grack support
mount Grack::Bundle.new({