Download as
Browse Code »

Commit a84a929428169022c6e365c80579ad587ecc55ed

Authored by Dmitriy Zaporozhets
2 parents 3f91da68 4748ae8c
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge pull request #426 from RLovelett/resque-update 

Fixes :public Warning In Resque When Running Any Rails Command
Showing 2 changed files with 3 additions and 3 deletions   Show diff stats
@@ -24,7 +24,7 @@ gem "acts_as_list" @@ -24,7 +24,7 @@ gem "acts_as_list"
24 gem "rdiscount" 24 gem "rdiscount"
25 gem "acts-as-taggable-on", "~> 2.1.0" 25 gem "acts-as-taggable-on", "~> 2.1.0"
26 gem "drapper" 26 gem "drapper"
27 -gem "resque" 27 +gem "resque", "~> 1.20.0"
28 gem "httparty" 28 gem "httparty"
29 gem "charlock_holmes" 29 gem "charlock_holmes"
30 gem "foreman" 30 gem "foreman"
@@ -196,7 +196,7 @@ GEM @@ -196,7 +196,7 @@ GEM
196 redis (2.2.2) 196 redis (2.2.2)
197 redis-namespace (1.0.3) 197 redis-namespace (1.0.3)
198 redis (< 3.0.0) 198 redis (< 3.0.0)
199 - resque (1.19.0) 199 + resque (1.20.0)
200 multi_json (~> 1.0) 200 multi_json (~> 1.0)
201 redis-namespace (~> 1.0.2) 201 redis-namespace (~> 1.0.2)
202 sinatra (>= 0.9.2) 202 sinatra (>= 0.9.2)
@@ -318,7 +318,7 @@ DEPENDENCIES @@ -318,7 +318,7 @@ DEPENDENCIES
318 rails-footnotes 318 rails-footnotes
319 rake 319 rake
320 rdiscount 320 rdiscount
321 - resque 321 + resque (~> 1.20.0)
322 rspec-rails 322 rspec-rails
323 sass-rails (= 3.2.3) 323 sass-rails (= 3.2.3)
324 seed-fu 324 seed-fu