Commit a84a9294 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #426 from RLovelett/resque-update

Fixes :public Warning In Resque When Running Any Rails Command
parents 3f91da68 4748ae8c
...@@ -24,7 +24,7 @@ gem "acts_as_list" ...@@ -24,7 +24,7 @@ gem "acts_as_list"
gem "rdiscount" gem "rdiscount"
gem "acts-as-taggable-on", "~> 2.1.0" gem "acts-as-taggable-on", "~> 2.1.0"
gem "drapper" gem "drapper"
gem "resque" gem "resque", "~> 1.20.0"
gem "httparty" gem "httparty"
gem "charlock_holmes" gem "charlock_holmes"
gem "foreman" gem "foreman"
......
...@@ -196,7 +196,7 @@ GEM ...@@ -196,7 +196,7 @@ GEM
redis (2.2.2) redis (2.2.2)
redis-namespace (1.0.3) redis-namespace (1.0.3)
redis (< 3.0.0) redis (< 3.0.0)
resque (1.19.0) resque (1.20.0)
multi_json (~> 1.0) multi_json (~> 1.0)
redis-namespace (~> 1.0.2) redis-namespace (~> 1.0.2)
sinatra (>= 0.9.2) sinatra (>= 0.9.2)
...@@ -318,7 +318,7 @@ DEPENDENCIES ...@@ -318,7 +318,7 @@ DEPENDENCIES
rails-footnotes rails-footnotes
rake rake
rdiscount rdiscount
resque resque (~> 1.20.0)
rspec-rails rspec-rails
sass-rails (= 3.2.3) sass-rails (= 3.2.3)
seed-fu seed-fu
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment