From e3265aa650b40e185fde1b58115911d8112c3469 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 17 May 2013 17:35:34 +0200 Subject: [PATCH] Revert "bump sidekiq" This reverts commit 9307a1aaeb2825bd025b46c25fc4c3d61b6d7954. --- Gemfile | 2 +- Gemfile.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Gemfile b/Gemfile index 1de06336a75..ba814e704ba 100644 --- a/Gemfile +++ b/Gemfile @@ -17,7 +17,7 @@ gem 'devise', '2.1.3' # Background processing -gem 'sidekiq', '2.12.0' +gem 'sidekiq', '2.11.1' gem 'sinatra', '1.3.3' gem 'slim', '1.3.8' diff --git a/Gemfile.lock b/Gemfile.lock index 18b02bc5916..ba77b24a870 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -55,7 +55,7 @@ GEM carrierwave (0.8.0) activemodel (>= 3.2.0) activesupport (>= 3.2.0) - celluloid (0.14.0) + celluloid (0.13.0) timers (>= 1.0.0) childprocess (0.3.9) ffi (~> 1.0, >= 1.0.11) @@ -209,7 +209,7 @@ GEM mobile-fu (1.1.1) rack-mobile-detect rails - multi_json (1.7.3) + multi_json (1.7.2) multipart-post (1.2.0) mysql2 (0.3.11) nested_form (0.3.2) @@ -308,7 +308,7 @@ GEM json (~> 1.4) redcarpet (2.2.2) redis (3.0.4) - redis-namespace (1.3.0) + redis-namespace (1.2.1) redis (~> 3.0.0) remotipart (1.0.5) rmagick (2.13.2) @@ -346,11 +346,11 @@ GEM multi_json (~> 1.0) rubyzip websocket (~> 1.0.4) - sidekiq (2.12.0) - celluloid (>= 0.14.0) - connection_pool (>= 1.0.0) - json - redis (>= 3.0) + sidekiq (2.11.1) + celluloid (~> 0.13.0) + connection_pool (~> 1.0) + multi_json (~> 1) + redis (~> 3) redis-namespace simple_oauth (0.2.0) sinatra (1.3.3) @@ -470,7 +470,7 @@ DEPENDENCIES ruby-oembed (= 0.8.8) sass-rails (= 3.2.6) selenium-webdriver (= 2.32.1) - sidekiq (= 2.12.0) + sidekiq (= 2.11.1) sinatra (= 1.3.3) sinon-rails (= 1.4.2.1) slim (= 1.3.8)