Skip to content

Commit

Permalink
Fixes Resque mounting.
Browse files Browse the repository at this point in the history
  • Loading branch information
matiaskorhonen committed Jun 14, 2012
1 parent cca963f commit ea4c1c5
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 12 deletions.
4 changes: 1 addition & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ gem "kaminari" #, "~> 0.10.4"
gem "nokogiri", "~> 1.4.4"
gem "hominid", "~> 3.0.2"
gem "yajl-ruby"
gem "resque", "~> 1.10.0"
gem "resque", "~> 1.20.0"
gem "zendesk_remote_auth"
gem "rake"

Expand All @@ -32,8 +32,6 @@ end

group :production do
gem "pg"
# gem "rack-ssl", "~> 1.1.0", :require => "rack/ssl"
# gem "newrelic_rpm", "~> 3.0.1"
end

group :test, :development do
Expand Down
12 changes: 6 additions & 6 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ GEM
railties (~> 3.0)
thor (~> 0.14)
jruby-jars (1.6.7.2)
json (1.4.6)
json (1.7.3)
kaminari (0.13.0)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
Expand Down Expand Up @@ -139,11 +139,11 @@ GEM
rdoc (3.12)
json (~> 1.4)
redis (2.2.2)
redis-namespace (0.8.0)
redis-namespace (1.0.3)
redis (< 3.0.0)
resque (1.10.0)
json (~> 1.4.6)
redis-namespace (~> 0.8.0)
resque (1.20.0)
multi_json (~> 1.0)
redis-namespace (~> 1.0.2)
sinatra (>= 0.9.2)
vegas (~> 0.1.2)
rspec (2.10.0)
Expand Down Expand Up @@ -234,7 +234,7 @@ DEPENDENCIES
pg
rails (= 3.1.6)
rake
resque (~> 1.10.0)
resque (~> 1.20.0)
rspec-rails
sass-rails
simple_form (~> 1.2.2)
Expand Down
4 changes: 2 additions & 2 deletions config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
# Bundler.require(:default, :assets, Rails.env)
end

# require "resque"
# require "resque/server"
require "resque"
require "resque/server"

module SplendidBacon
class Application < Rails::Application
Expand Down
2 changes: 1 addition & 1 deletion config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
end

authenticate :admin do
# mount Resque::Server.new, :at => "/magic/resque"
mount Resque::Server.new, :at => "/magic/resque", as: :magic_resque
end

end

0 comments on commit ea4c1c5

Please sign in to comment.