Merge pull request #1351 from tsigo/nonrelative_resque

Give Resque route a name and use that for the iframe src
2012-09-02 11:58:13 -07:00 · 2012-09-02 11:58:13 -07:00 · 6997543ac2
parent f9711cd81a 0de5d08e37
commit 6997543ac2
2 changed files with 2 additions and 2 deletions
--- a/app/views/admin/resque/show.html.haml
+++ b/app/views/admin/resque/show.html.haml
@ -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"}
--- a/config/routes.rb
+++ b/config/routes.rb
@ -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({