Merge pull request gitlabhq#1351 from tsigo/nonrelative_resque

Give Resque route a name and use that for the iframe src
ffomenko · Sep 2, 2012 · 6997543 · 6997543
2 parents f9711cd + 0de5d08
commit 6997543
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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"}
diff --git a/config/routes.rb b/config/routes.rb
@@ -10,7 +10,7 @@
 
   # 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({