diff --git a/Gemfile.lock b/Gemfile.lock index 50ab8ea..2339e6e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -44,7 +44,6 @@ GEM capistrano_colors (0.5.5) capistrano_rsync_with_remote_cache (2.4.0) capistrano (>= 2.1.0) - celluloid (0.10.0) chronic (0.6.7) coffee-rails (3.2.2) coffee-script (>= 2.2.0) @@ -55,7 +54,7 @@ GEM coffee-script-source (1.2.0) columnize (0.3.6) commonjs (0.2.5) - connection_pool (0.9.1) + connection_pool (2.2.5) crack (0.3.1) daemons (1.1.9) database_cleaner (0.7.2) @@ -132,7 +131,7 @@ GEM treetop (~> 1.4.8) marked (1.2.2) mime-types (1.19) - multi_json (1.5.0) + multi_json (1.15.0) multipart-post (1.1.5) mysql2 (0.3.11) net-scp (1.0.4) @@ -159,10 +158,10 @@ GEM permanent_records (2.1.2) activerecord polyglot (0.3.3) - rack (1.4.3) + rack (1.4.7) rack-cache (1.2) rack (>= 0.4) - rack-protection (1.2.0) + rack-protection (1.5.5) rack rack-ssl (1.3.2) rack @@ -186,9 +185,7 @@ GEM rake (10.0.3) rdoc (3.12) json (~> 1.4) - redis (2.2.2) - redis-namespace (1.1.0) - redis (< 3.0.0) + redis (4.5.1) responders (0.9.1) railties (~> 3.1) rspec (2.9.0) @@ -210,12 +207,11 @@ GEM sass (>= 3.1.10) tilt (~> 1.3) shoulda-matchers (1.0.0) - sidekiq (0.11.1) - celluloid (~> 0.10.0) - connection_pool (~> 0.9.0) - multi_json - redis - redis-namespace + sidekiq (5.2.8) + connection_pool (~> 2.2, >= 2.2.2) + rack (< 2.1.0) + rack-protection (>= 1.5.0) + redis (>= 3.3.5, < 5) simple_form (2.0.1) actionpack (~> 3.0) activemodel (~> 3.0)