diff --git a/Gemfile b/Gemfile index f71de695..9b3befd1 100644 --- a/Gemfile +++ b/Gemfile @@ -25,7 +25,7 @@ gem 'whenever', '~> 0.7.3', :require => false gem 'swf_converter', '~> 0.0.3' -gem 'resque', '~> 1.15.0' +gem 'resque', '~> 1.23.0' gem 'resque-scheduler', '~> 2.0.0.d' gem 'resque-retry', '~> 0.1.0' diff --git a/Gemfile.lock b/Gemfile.lock index 59a0ca86..ed178087 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -155,7 +155,7 @@ GEM jammit (0.5.4) closure-compiler (>= 0.1.0) yui-compressor (>= 0.9.1) - json (1.4.6) + json (1.7.6) mail (2.2.19) activesupport (>= 2.3.6) i18n (>= 0.4.0) @@ -213,9 +213,9 @@ GEM redis (3.0.2) redis-namespace (1.2.1) redis (~> 3.0.0) - resque (1.15.0) - json (~> 1.4.6) - redis-namespace (>= 0.10.0) + resque (1.23.0) + multi_json (~> 1.0) + redis-namespace (~> 1.0) sinatra (>= 0.9.2) vegas (~> 0.1.2) resque-retry (0.1.0) @@ -308,7 +308,7 @@ DEPENDENCIES rack-fiber_pool rails (= 3.0.19) rdiscount (~> 1.6.5) - resque (~> 1.15.0) + resque (~> 1.23.0) resque-retry (~> 0.1.0) resque-scheduler (~> 2.0.0.d) rest-client (~> 1.6.7) diff --git a/vendor/cache/json-1.4.6.gem b/vendor/cache/json-1.4.6.gem deleted file mode 100644 index 53e04e6e..00000000 Binary files a/vendor/cache/json-1.4.6.gem and /dev/null differ diff --git a/vendor/cache/json-1.7.6.gem b/vendor/cache/json-1.7.6.gem new file mode 100644 index 00000000..97a31710 Binary files /dev/null and b/vendor/cache/json-1.7.6.gem differ diff --git a/vendor/cache/resque-1.15.0.gem b/vendor/cache/resque-1.15.0.gem deleted file mode 100644 index ff74983d..00000000 Binary files a/vendor/cache/resque-1.15.0.gem and /dev/null differ diff --git a/vendor/cache/resque-1.23.0.gem b/vendor/cache/resque-1.23.0.gem new file mode 100644 index 00000000..8fa433aa Binary files /dev/null and b/vendor/cache/resque-1.23.0.gem differ