deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1968 from shtirlic/fix_thin

Browse source 
Update thin closes #1765 and maybe #1051
This commit is contained in:
Saito 2012-11-13 07:32:18 -08:00
commit ea6359df6c
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -68,7 +68,7 @@ gem "redcarpet", "~> 2.1.1"
gem "github-markup", "~> 0.7.4", require: 'github/markup' gem "github-markup", "~> 0.7.4", require: 'github/markup'
# Servers # Servers
gem "thin" gem "thin", '~> 1.5.0'
gem "unicorn" gem "unicorn"
# Issue tags # Issue tags

8
Gemfile.lock
View file

@ -117,7 +117,7 @@ GEM
colored (1.2) colored (1.2)
colorize (0.5.8) colorize (0.5.8)
crack (0.3.1) crack (0.3.1)
daemons (1.1.8) daemons (1.1.9)
database_cleaner (0.8.0) database_cleaner (0.8.0)
devise (2.1.2) devise (2.1.2)
bcrypt-ruby (~> 3.0) bcrypt-ruby (~> 3.0)
@ -133,7 +133,7 @@ GEM
rspec (~> 2.0) rspec (~> 2.0)
erubis (2.7.0) erubis (2.7.0)
escape_utils (0.2.4) escape_utils (0.2.4)
eventmachine (0.12.10) eventmachine (1.0.0)
execjs (1.4.0) execjs (1.4.0)
multi_json (~> 1.0) multi_json (~> 1.0)
factory_girl (4.0.0) factory_girl (4.0.0)
@ -384,7 +384,7 @@ GEM
test_after_commit (0.0.1) test_after_commit (0.0.1)
therubyracer (0.10.1) therubyracer (0.10.1)
libv8 (~> 3.3.10) libv8 (~> 3.3.10)
thin (1.3.1) thin (1.5.0)
daemons (>= 1.0.9) daemons (>= 1.0.9)
eventmachine (>= 0.12.6) eventmachine (>= 0.12.6)
rack (>= 1.0.0) rack (>= 1.0.0)
@ -489,7 +489,7 @@ DEPENDENCIES
stamp stamp
test_after_commit test_after_commit
therubyracer therubyracer
thin thin (~> 1.5.0)
uglifier (= 1.0.3) uglifier (= 1.0.3)
unicorn unicorn
webmock webmock