Merge pull request gitlabhq#1351 from tsigo/nonrelative_resque

dzaporozhets · dzaporozhets · commit 6997543ac271 · 2012-09-02T11:58:13.000-07:00
Give Resque route a name and use that for the iframe src
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({

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`%h3 Resque`
`2`		`-%iframe{src: "/info/resque", width: 1168, height: 600, style: "border: none"}`
	`2`	`+%iframe{src: resque_url, width: 1168, height: 600, style: "border: none"}`