Merge pull request #1351 from tsigo/nonrelative_resque

Give Resque route a name and use that for the iframe src

Merge pull request #1351 from tsigo/nonrelative_resque
Give Resque route a name and use that for the iframe src
Dmitriy Zaporozhets
2 parents f9711cd8 0de5d08e
Showing 2 changed files with 2 additions and 2 deletions Show diff stats
app/views/admin/resque/show.html.haml
config/routes.rb
 %h3 Resque
-%iframe{src: "/info/resque", width: 1168, height: 600, style: "border: none"}
 \ No newline at end of file
+%iframe{src: resque_url, width: 1168, height: 600, style: "border: none"}
@@ -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({
1	1	%h3 Resque
2		-%iframe{src: "/info/resque", width: 1168, height: 600, style: "border: none"}
3	2	\ No newline at end of file
	3	+%iframe{src: resque_url, width: 1168, height: 600, style: "border: none"}
...	...
...	...	@@ -10,7 +10,7 @@ Gitlab::Application.routes.draw do
10	10
11	11	# Optionally, enable Resque here
12	12	require 'resque/server'
13		- mount Resque::Server.new, at: '/info/resque'
	13	+ mount Resque::Server.new, at: '/info/resque', as: 'resque'
14	14
15	15	# Enable Grack support
16	16	mount Grack::Bundle.new({
...	...