Merge pull request #1968 from shtirlic/fix_thin

Update thin closes #1765 and maybe #1051

Merge pull request #1968 from shtirlic/fix_thin
Update thin closes #1765 and maybe #1051
Saito
2 parents 9d499b86 4abf5d06
Showing 2 changed files with 5 additions and 5 deletions Show diff stats
Gemfile
Gemfile.lock
@@ -68,7 +68,7 @@ gem &quot;redcarpet&quot;,     &quot;~&gt; 2.1.1&quot;
 gem "github-markup", "~> 0.7.4", require: 'github/markup'
  
 # Servers
-gem "thin"
+gem "thin", '~> 1.5.0'
 gem "unicorn"
  
 # Issue tags
@@ -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
...	...	@@ -68,7 +68,7 @@ gem "redcarpet", "~> 2.1.1"
68	68	gem "github-markup", "~> 0.7.4", require: 'github/markup'
69	69
70	70	# Servers
71		-gem "thin"
	71	+gem "thin", '~> 1.5.0'
72	72	gem "unicorn"
73	73
74	74	# Issue tags
...	...