diff --git a/Gemfile b/Gemfile index 54cc06d73f58a49d6fcf058561ac604fc199f515..dd6af5113f037a169419ae17d5656817d2ee2196 100644 --- a/Gemfile +++ b/Gemfile @@ -40,7 +40,7 @@ end group :heroku do gem 'pg' - gem 'unicorn', '~> 4.1.1', :require => false + gem 'unicorn', '~> 4.2.0', :require => false end gem 'settingslogic', :git => 'git://github.com/binarylogic/settingslogic.git' diff --git a/Gemfile.lock b/Gemfile.lock index dd8acdc6c6e22f9c811c974ee9f9020e5e67de23..b42fb741bb18530e6bf9139f322bef7ae245fdb0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -221,7 +221,7 @@ GEM multi_json jwt (0.1.4) json (>= 1.2.4) - kgio (2.7.0) + kgio (2.7.2) launchy (2.0.3) linecache (0.46) rbx-require-relative (> 0.0.4) @@ -406,10 +406,10 @@ GEM typhoeus (0.3.3) mime-types tzinfo (0.3.31) - unicorn (4.1.1) - kgio (~> 2.4) + unicorn (4.2.0) + kgio (~> 2.6) rack - raindrops (~> 0.6) + raindrops (~> 0.7) vegas (0.1.11) warden (1.0.6) rack (>= 1.0) @@ -514,7 +514,7 @@ DEPENDENCIES timecop twitter (= 2.0.2) typhoeus - unicorn (~> 4.1.1) + unicorn (~> 4.2.0) webmock whenever will_paginate