Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
6997543a
Commit
6997543a
authored
Sep 02, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1351 from tsigo/nonrelative_resque
Give Resque route a name and use that for the iframe src
parents
f9711cd8
0de5d08e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
app/views/admin/resque/show.html.haml
app/views/admin/resque/show.html.haml
+1
-1
config/routes.rb
config/routes.rb
+1
-1
No files found.
app/views/admin/resque/show.html.haml
View file @
6997543a
%h3
Resque
%h3
Resque
%iframe
{
src:
"/info/resque"
,
width:
1168
,
height:
600
,
style:
"border: none"
}
%iframe
{
src:
resque_url
,
width:
1168
,
height:
600
,
style:
"border: none"
}
\ No newline at end of file
config/routes.rb
View file @
6997543a
...
@@ -10,7 +10,7 @@ Gitlab::Application.routes.draw do
...
@@ -10,7 +10,7 @@ Gitlab::Application.routes.draw do
# Optionally, enable Resque here
# Optionally, enable Resque here
require
'resque/server'
require
'resque/server'
mount
Resque
::
Server
.
new
,
at:
'/info/resque'
mount
Resque
::
Server
.
new
,
at:
'/info/resque'
,
as:
'resque'
# Enable Grack support
# Enable Grack support
mount
Grack
::
Bundle
.
new
({
mount
Grack
::
Bundle
.
new
({
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment