From c301f80ca9ad2e450943eddff63a1b91e0e653df Mon Sep 17 00:00:00 2001
From: danielgrippi <danielgrippi@gmail.com>
Date: Fri, 3 Feb 2012 15:12:44 -0800
Subject: [PATCH] update unicorn [ci skip]
---
Gemfile | 2 +-
Gemfile.lock | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Gemfile b/Gemfile
index 54cc06d73f..dd6af5113f 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 dd8acdc6c6..b42fb741bb 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
--
GitLab