Download as
Browse Code »

Commit 6997543ac271db3970b7acd82a35f49ba63807ec

Authored by Dmitriy Zaporozhets
2 parents f9711cd8 0de5d08e
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge pull request #1351 from tsigo/nonrelative_resque 

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