From: shtirlic <serg@podtynnyi.com>
Date: Sat, 10 Nov 2012 16:30:22 +0000 (+0400)
Subject: Update thin closes #1765 and maybe #1051
X-Git-Tag: v3.1.0~54^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4abf5d06f1104469500c3565890f70f81fbee8bc;p=wvm%2Fgitlab.git

Update thin closes #1765 and maybe #1051
---

diff --git a/Gemfile b/Gemfile
index 84b557ba3..475b6e8e1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -68,7 +68,7 @@ gem "redcarpet",     "~> 2.1.1"
 gem "github-markup", "~> 0.7.4", require: 'github/markup'
 
 # Servers
-gem "thin"
+gem "thin", '~> 1.5.0'
 gem "unicorn"
 
 # Issue tags
diff --git a/Gemfile.lock b/Gemfile.lock
index 617c302ba..b67f5856e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -117,7 +117,7 @@ GEM
     colored (1.2)
     colorize (0.5.8)
     crack (0.3.1)
-    daemons (1.1.8)
+    daemons (1.1.9)
     database_cleaner (0.8.0)
     devise (2.1.2)
       bcrypt-ruby (~> 3.0)
@@ -133,7 +133,7 @@ GEM
       rspec (~> 2.0)
     erubis (2.7.0)
     escape_utils (0.2.4)
-    eventmachine (0.12.10)
+    eventmachine (1.0.0)
     execjs (1.4.0)
       multi_json (~> 1.0)
     factory_girl (4.0.0)
@@ -384,7 +384,7 @@ GEM
     test_after_commit (0.0.1)
     therubyracer (0.10.1)
       libv8 (~> 3.3.10)
-    thin (1.3.1)
+    thin (1.5.0)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
@@ -489,7 +489,7 @@ DEPENDENCIES
   stamp
   test_after_commit
   therubyracer
-  thin
+  thin (~> 1.5.0)
   uglifier (= 1.0.3)
   unicorn
   webmock