Download as
Browse Code »

Commit ea6359df6c6390c96fd469a75e5f1b2237c1f700

Authored by Saito
2 parents 9d499b86 4abf5d06
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge pull request #1968 from shtirlic/fix_thin 

Update thin closes #1765 and maybe #1051
Showing 2 changed files with 5 additions and 5 deletions   Show diff stats
@@ -68,7 +68,7 @@ gem "redcarpet", "~> 2.1.1" @@ -68,7 +68,7 @@ gem "redcarpet", "~> 2.1.1"
68 gem "github-markup", "~> 0.7.4", require: 'github/markup' 68 gem "github-markup", "~> 0.7.4", require: 'github/markup'
69 69
70 # Servers 70 # Servers
71 -gem "thin" 71 +gem "thin", '~> 1.5.0'
72 gem "unicorn" 72 gem "unicorn"
73 73
74 # Issue tags 74 # Issue tags
@@ -117,7 +117,7 @@ GEM @@ -117,7 +117,7 @@ GEM
117 colored (1.2) 117 colored (1.2)
118 colorize (0.5.8) 118 colorize (0.5.8)
119 crack (0.3.1) 119 crack (0.3.1)
120 - daemons (1.1.8) 120 + daemons (1.1.9)
121 database_cleaner (0.8.0) 121 database_cleaner (0.8.0)
122 devise (2.1.2) 122 devise (2.1.2)
123 bcrypt-ruby (~> 3.0) 123 bcrypt-ruby (~> 3.0)
@@ -133,7 +133,7 @@ GEM @@ -133,7 +133,7 @@ GEM
133 rspec (~> 2.0) 133 rspec (~> 2.0)
134 erubis (2.7.0) 134 erubis (2.7.0)
135 escape_utils (0.2.4) 135 escape_utils (0.2.4)
136 - eventmachine (0.12.10) 136 + eventmachine (1.0.0)
137 execjs (1.4.0) 137 execjs (1.4.0)
138 multi_json (~> 1.0) 138 multi_json (~> 1.0)
139 factory_girl (4.0.0) 139 factory_girl (4.0.0)
@@ -384,7 +384,7 @@ GEM @@ -384,7 +384,7 @@ GEM
384 test_after_commit (0.0.1) 384 test_after_commit (0.0.1)
385 therubyracer (0.10.1) 385 therubyracer (0.10.1)
386 libv8 (~> 3.3.10) 386 libv8 (~> 3.3.10)
387 - thin (1.3.1) 387 + thin (1.5.0)
388 daemons (>= 1.0.9) 388 daemons (>= 1.0.9)
389 eventmachine (>= 0.12.6) 389 eventmachine (>= 0.12.6)
390 rack (>= 1.0.0) 390 rack (>= 1.0.0)
@@ -489,7 +489,7 @@ DEPENDENCIES @@ -489,7 +489,7 @@ DEPENDENCIES
489 stamp 489 stamp
490 test_after_commit 490 test_after_commit
491 therubyracer 491 therubyracer
492 - thin 492 + thin (~> 1.5.0)
493 uglifier (= 1.0.3) 493 uglifier (= 1.0.3)
494 unicorn 494 unicorn
495 webmock 495 webmock